annotate py/tempserver.py @ 253:0a1b642e3086

long polling config updates
author Matt Johnston <matt@ucc.asn.au>
date Mon, 08 Jun 2015 22:29:46 +0800
parents fd29ae905d1b
children 26eee8591f61
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
228
d9e81a563923 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 219
diff changeset
8 import asyncio
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
9 import argparse
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
10
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
231
e39ed85d87a5 fix a few python3 issues
Matt Johnston <matt@ucc.asn.au>
parents: 230
diff changeset
18 import sensor
145
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):
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
24 def __init__(self, test_mode):
141
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
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
28 self._wakeup = asyncio.Event()
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
29 self._test_mode = test_mode
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
30
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
31 def __enter__(self):
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
32 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
33 self.fridge = fridge.Fridge(self)
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
34 self.uploader = uploader.Uploader(self)
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
35 self.configwaiter = configwaiter.ConfigWaiter(self)
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
36 self.params.load()
229
99255c501e02 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 228
diff changeset
37 self.set_sensors(sensor.make_sensor(self))
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
38 asyncio.get_event_loop().add_signal_handler(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
39 return self
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
40
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
41 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
42 L("Exiting, cleanup handler");
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
43 self.fridge.off()
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
44
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
45 def run(self):
149
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
46
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
47 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
48 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
49
d686b111dab4 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 148
diff changeset
50 # 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
51 self.start_time = self.now()
234
fd29ae905d1b Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 233
diff changeset
52 runloops = [
228
d9e81a563923 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 219
diff changeset
53 self.fridge.run(),
d9e81a563923 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 219
diff changeset
54 self.sensors.run(),
d9e81a563923 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 219
diff changeset
55 self.uploader.run(),
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
56 self.configwaiter.run(),
234
fd29ae905d1b Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 233
diff changeset
57 ]
232
a01b7bccccd3 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 231
diff changeset
58
228
d9e81a563923 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 219
diff changeset
59 loop = asyncio.get_event_loop()
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
60 try:
234
fd29ae905d1b Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 233
diff changeset
61 loop.run_until_complete(asyncio.gather(*runloops))
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
62 except KeyboardInterrupt:
234
fd29ae905d1b Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 233
diff changeset
63 print('\nctrl-c')
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
64 finally:
234
fd29ae905d1b Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 233
diff changeset
65 # loop.close() seems necessary otherwise get warnings about signal handlers
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
66 loop.close()
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
67
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
68 def now(self):
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
69 return utils.monotonic_time()
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
70
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
71 def set_sensors(self, sensors):
148
b32e5a11a4cb few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 145
diff changeset
72 if hasattr(self, 'sensors'):
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
73 self.sensors.kill()
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
74 self.sensors = sensors
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
75 self.wort_name = sensors.wort_name()
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
76 self.fridge_name = sensors.fridge_name()
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
77
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
78 def take_readings(self):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
79 ret = self.readings
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
80 self.readings = []
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
81 return ret
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
82
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
83 def pushfront(self, readings):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
84 """ used if a caller of take_readings() fails """
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
85 self.readings = readings + self.readings
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
86
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
87 # 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
88 # are float degrees
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
89 def add_reading(self, reading):
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
90 """ adds a reading at the current time """
155
d03157c7ad60 rough touch sensor
Matt Johnston <matt@ucc.asn.au>
parents: 149
diff changeset
91 D("add_reading(%s)" % str(reading))
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
92 self.readings.append( (reading, self.now()))
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
93 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
94 reading.get(self.fridge_name, None))
160
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
95 if len(self.readings) > config.MAX_READINGS:
256505f98c4d uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 157
diff changeset
96 self.readings = self.readings[-config.MAX_READINGS:]
141
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
97
4755e6f9a5b8 python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
98 def current_temps(self):
144
482d7852b511 a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 143
diff changeset
99 """ returns (wort_temp, fridge_temp) tuple """
232
a01b7bccccd3 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 231
diff changeset
100 D("current: %s" % str(self.current))
148
b32e5a11a4cb few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 145
diff changeset
101 return self.current
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
102
232
a01b7bccccd3 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 231
diff changeset
103 @asyncio.coroutine
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
104 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
105 """ sleeps for timeout seconds, though wakes if the server's config is updated """
232
a01b7bccccd3 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 231
diff changeset
106 # XXX fixme - we should wake on _wakeup but asyncio Condition with wait_for is a bit broken?
a01b7bccccd3 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 231
diff changeset
107 # https://groups.google.com/forum/#!topic/python-tulip/eSm7rZAe9LM
a01b7bccccd3 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 231
diff changeset
108 # For now we just sleep, ignore the _wakeup
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
109 try:
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
110 yield from asyncio.wait_for(self._wakeup.wait(), timeout=timeout)
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
111 except asyncio.TimeoutError:
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
112 pass
234
fd29ae905d1b Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 233
diff changeset
113
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
114 def reload_signal(self, no_file = False):
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
115 try:
253
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
116 if not no_file:
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
117 self.params.load()
0a1b642e3086 long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 234
diff changeset
118 L("Reloaded.")
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
119 self._wakeup.set()
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
120 self._wakeup.clear()
229
99255c501e02 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 228
diff changeset
121 except Error as e:
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
122 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
123
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
124 def test_mode(self):
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
125 return self._test_mode
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
126
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
127 def setup_logging(debug = False):
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
128 level = logging.INFO
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
129 if debug:
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
130 level = logging.DEBUG
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
131 logging.basicConfig(format='%(asctime)s %(message)s',
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
132 datefmt='%m/%d/%Y %I:%M:%S %p',
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
133 level=level)
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
134 #logging.getLogger("asyncio").setLevel(logging.DEBUG)
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
135
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
136 def start(test_mode):
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
137 with Tempserver(test_mode) as server:
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
138 server.run()
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
139
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
140 def main():
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
141 parser = argparse.ArgumentParser()
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
142 parser.add_argument('--hup', action='store_true')
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
143 parser.add_argument('--new', action='store_true')
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
144 parser.add_argument('--daemon', action='store_true')
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
145 parser.add_argument('-d', '--debug', action='store_true')
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
146 parser.add_argument('-t', '--test', action='store_true')
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
147 args = parser.parse_args()
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
148
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
149 setup_logging(args.debug)
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
150
174
c49d87bb81b9 fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents: 172
diff changeset
151 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
152 pidpath = os.path.join(heredir, 'tempserver.pid')
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
153 pidf = lockfile.pidlockfile.PIDLockFile(pidpath, threaded=False)
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
154
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
155
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
156 try:
217
5eb7e2400c18 fix pid locking
Matt Johnston <matt@ucc.asn.au>
parents: 199
diff changeset
157 pidf.acquire(1)
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
158 pidf.release()
229
99255c501e02 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 228
diff changeset
159 except (lockfile.AlreadyLocked, lockfile.LockTimeout) as e:
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
160 pid = pidf.read_pid()
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
161 if args.hup:
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
162 try:
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
163 os.kill(pid, signal.SIGHUP)
230
185621f47040 run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 229
diff changeset
164 print("Sent SIGHUP to process %d" % pid, file=sys.stderr)
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
165 sys.exit(0)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
166 except OSError:
230
185621f47040 run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 229
diff changeset
167 print("Process %d isn't running?" % pid, file=sys.stderr)
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
168 sys.exit(1)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
169
230
185621f47040 run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 229
diff changeset
170 print("Locked by PID %d" % pid, file=sys.stderr)
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
171
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
172 stale = False
172
5821c5fab919 use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 163
diff changeset
173 if pid > 0:
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
174 if args.new:
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
175 try:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
176 os.kill(pid, 0)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
177 except OSError:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
178 stale = True
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
179
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
180 if not stale:
230
185621f47040 run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 229
diff changeset
181 print("Stopping old tempserver pid %d" % pid, file=sys.stderr)
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
182 os.kill(pid, signal.SIGTERM)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
183 time.sleep(2)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
184 pidf.acquire(0)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
185 pidf.release()
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
186 else:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
187 try:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
188 os.kill(pid, 0)
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
189 # must still be running PID
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
190 raise e
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
191 except OSError:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
192 stale = True
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
193
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
194 if stale:
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
195 # isn't still running, steal the lock
230
185621f47040 run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 229
diff changeset
196 print("Unlinking stale lockfile %s for pid %d" % (pidpath, pid), file=sys.stderr)
198
be579bcf3c7f Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 174
diff changeset
197 pidf.break_lock()
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
198
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
199 if args.hup:
230
185621f47040 run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 229
diff changeset
200 print("Doesn't seem to be running", file=sys.stderr)
199
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
201 sys.exit(1)
2affbaae408b add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 198
diff changeset
202
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
203 if args.daemon:
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
204 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
205 logf = open(logpath, 'a+')
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
206 with daemon.DaemonContext(pidfile=pidf, stdout=logf, stderr = logf):
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
207 start(args.test)
162
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
208 else:
d73077e8cd67 Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 160
diff changeset
209 with pidf:
233
19569cb5ed46 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 232
diff changeset
210 start(args.test)
145
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
211
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
212 if __name__ == '__main__':
6517ddee3187 few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 144
diff changeset
213 main()