annotate py/tempserver.py @ 292:28eb733cb803

60 second timeout
author Matt Johnston <matt@ucc.asn.au>
date Thu, 19 Mar 2015 21:50:52 +0800
parents 16a83e2c97a0
children d9e81a563923
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
148
b32e5a11a4cb few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 145
diff changeset
1 #!/home/matt/templog/venv/bin/python
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 import sys
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 import os
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
5 import logging
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
6 import time
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
7 import signal
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
8
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
9 import gevent
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
10 import gevent.monkey
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
11 import lockfile.pidlockfile
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
12 import daemon
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
13
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
14 import utils
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
15 from utils import L,D,EX,W
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
16 import fridge
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
17 import config
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
18 import sensor_ds18b20
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
19 import params
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
20 import uploader
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
21
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23 class Tempserver(object):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24 def __init__(self):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
25 self.readings = []
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
26 self.current = (None, None)
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
27 self.fridge = None
219
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
28 self._wakeup = gevent.event.Event()
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
29
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
30 # don't patch os, fork() is used by daemonize
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
31 gevent.monkey.patch_all(os=False, thread=False)
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
32
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
33 def __enter__(self):
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
34 self.params = params.Params()
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
35 self.fridge = fridge.Fridge(self)
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
36 self.uploader = uploader.Uploader(self)
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
37 self.params.load()
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
38 self.set_sensors(sensor_ds18b20.DS18B20s(self))
219
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
39 gevent.signal(signal.SIGHUP, self._reload_signal)
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
40 return self
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
41
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
42 def __exit__(self, exc_type, exc_value, traceback):
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
43 L("Exiting, cleanup handler");
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
44 self.fridge.off()
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
45
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
46 def run(self):
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
47
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
48 if self.fridge is None:
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
49 raise Exception("Tempserver.run() must be within 'with Tempserver() as server'")
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
50
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
51 # XXX do these go here or in __enter_() ?
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
52 self.start_time = self.now()
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
53 self.fridge.start()
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
54 self.sensors.start()
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
55 self.uploader.start()
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
56
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
57 # won't return.
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
58 while True:
157
6d799bee3508 reload config on SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 155
diff changeset
59 try:
6d799bee3508 reload config on SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 155
diff changeset
60 gevent.sleep(60)
6d799bee3508 reload config on SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 155
diff changeset
61 except KeyboardInterrupt:
6d799bee3508 reload config on SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 155
diff changeset
62 break
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
63
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
64 def now(self):
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
65 return utils.monotonic_time()
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
66
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
67 def set_sensors(self, sensors):
148
b32e5a11a4cb few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 145
diff changeset
68 if hasattr(self, 'sensors'):
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
69 self.sensors.kill()
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
70 self.sensors = sensors
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
71 self.wort_name = sensors.wort_name()
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
72 self.fridge_name = sensors.fridge_name()
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
73
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
74 def take_readings(self):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
75 ret = self.readings
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
76 self.readings = []
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
77 return ret
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
78
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
79 def pushfront(self, readings):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
80 """ used if a caller of take_readings() fails """
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
81 self.readings = readings + self.readings
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
82
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
83 # a reading is a map of {sensorname: value}. temperatures
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
84 # are float degrees
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
85 def add_reading(self, reading):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
86 """ adds a reading at the current time """
155
d03157c7ad60 rough touch sensor
Matt Johnston <matt@ucc.asn.au>
parents: 149
diff changeset
87 D("add_reading(%s)" % str(reading))
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
88 self.readings.append( (reading, self.now()))
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
89 self.current = (reading.get(self.wort_name, None),
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
90 reading.get(self.fridge_name, None))
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
91 if len(self.readings) > config.MAX_READINGS:
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
92 self.readings = self.readings[-config.MAX_READINGS:]
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
93
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
94 def current_temps(self):
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
95 """ returns (wort_temp, fridge_temp) tuple """
148
b32e5a11a4cb few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 145
diff changeset
96 return self.current
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
97
219
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
98 def sleep(self, timeout):
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
99 """ sleeps for timeout seconds, though wakes if the server's config is updated """
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
100 self._wakeup.wait(timeout)
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
101
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
102 def _reload_signal(self):
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
103 try:
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
104 self.params.load()
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
105 L("Reloaded.")
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
106 self._wakeup.set()
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
107 self._wakeup.clear()
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
108 except self.Error, e:
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
109 W("Problem reloading: %s" % str(e))
16a83e2c97a0 sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents: 217
diff changeset
110
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
111 def setup_logging():
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
112 logging.basicConfig(format='%(asctime)s %(message)s',
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
113 datefmt='%m/%d/%Y %I:%M:%S %p',
163
bf2a17873ba1 less verbose logging
Matt Johnston <matt@ucc.asn.au>
parents: 162
diff changeset
114 level=logging.INFO)
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
115
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
116 def start():
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
117 with Tempserver() as server:
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
118 server.run()
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
119
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
120 def main():
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
121 setup_logging()
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
122
174
c49d87bb81b9 fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents: 172
diff changeset
123 heredir = os.path.abspath(os.path.dirname(__file__))
c49d87bb81b9 fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents: 172
diff changeset
124 pidpath = os.path.join(heredir, 'tempserver.pid')
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
125 pidf = lockfile.pidlockfile.PIDLockFile(pidpath, threaded=False)
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
126 do_hup = '--hup' in sys.argv
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
127 try:
217
5eb7e2400c18 fix pid locking
Matt Johnston <matt@ucc.asn.au>
parents: 199
diff changeset
128 pidf.acquire(1)
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
129 pidf.release()
217
5eb7e2400c18 fix pid locking
Matt Johnston <matt@ucc.asn.au>
parents: 199
diff changeset
130 except (lockfile.AlreadyLocked, lockfile.LockTimeout), e:
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
131 pid = pidf.read_pid()
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
132 if do_hup:
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
133 try:
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
134 os.kill(pid, signal.SIGHUP)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
135 print>>sys.stderr, "Sent SIGHUP to process %d" % pid
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
136 sys.exit(0)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
137 except OSError:
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
138 print>>sys.stderr, "Process %d isn't running?" % pid
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
139 sys.exit(1)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
140
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
141 print>>sys.stderr, "Locked by PID %d" % pid
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
142
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
143 stale = False
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
144 if pid > 0:
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
145 if '--new' in sys.argv:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
146 try:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
147 os.kill(pid, 0)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
148 except OSError:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
149 stale = True
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
150
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
151 if not stale:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
152 print>>sys.stderr, "Stopping old tempserver pid %d" % pid
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
153 os.kill(pid, signal.SIGTERM)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
154 time.sleep(2)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
155 pidf.acquire(0)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
156 pidf.release()
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
157 else:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
158 try:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
159 os.kill(pid, 0)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
160 # must still be running PID
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
161 raise e
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
162 except OSError:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
163 stale = True
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
164
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
165 if stale:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
166 # isn't still running, steal the lock
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
167 print>>sys.stderr, "Unlinking stale lockfile %s for pid %d" % (pidpath, pid)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
168 pidf.break_lock()
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
169
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
170 if do_hup:
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
171 print>>sys.stderr, "Doesn't seem to be running"
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
172 sys.exit(1)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
173
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
174 if '--daemon' in sys.argv:
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
175 logpath = os.path.join(os.path.dirname(__file__), 'tempserver.log')
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
176 logf = open(logpath, 'a+')
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
177 with daemon.DaemonContext(pidfile=pidf, stdout=logf, stderr = logf):
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
178 start()
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
179 else:
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
180 with pidf:
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
181 start()
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
182
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
183 if __name__ == '__main__':
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
184 main()