Mercurial > templog
annotate py/tempserver.py @ 556:c5f8375b12a2
long polling works
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 09 Jun 2015 23:27:44 +0800 |
| parents | 9499bd2f344b |
| children | 20c89630be6c |
| rev | line source |
|---|---|
| 447 | 1 #!/home/matt/templog/venv/bin/python |
| 439 | 2 |
| 3 import sys | |
| 4 import os | |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
5 import logging |
| 498 | 6 import time |
| 7 import signal | |
| 527 | 8 import asyncio |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
9 import argparse |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
10 |
| 471 | 11 import lockfile.pidlockfile |
|
461
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
12 import daemon |
| 439 | 13 |
| 14 import utils | |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
15 from utils import L,D,EX,W |
| 444 | 16 import fridge |
| 17 import config | |
| 530 | 18 import sensor |
| 444 | 19 import params |
| 459 | 20 import uploader |
| 556 | 21 import configwaiter |
| 444 | 22 |
| 439 | 23 |
| 24 class Tempserver(object): | |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
25 def __init__(self, test_mode): |
| 439 | 26 self.readings = [] |
| 444 | 27 self.current = (None, None) |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
28 self.fridge = None |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
29 self._wakeup = asyncio.Event() |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
30 self._test_mode = test_mode |
| 439 | 31 |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
32 def __enter__(self): |
| 444 | 33 self.params = params.Params() |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
34 self.fridge = fridge.Fridge(self) |
| 459 | 35 self.uploader = uploader.Uploader(self) |
|
551
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
36 self.configwaiter = configwaiter.ConfigWaiter(self) |
| 444 | 37 self.params.load() |
| 528 | 38 self.set_sensors(sensor.make_sensor(self)) |
|
551
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
39 asyncio.get_event_loop().add_signal_handler(signal.SIGHUP, self.reload_signal) |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
40 return self |
| 439 | 41 |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
42 def __exit__(self, exc_type, exc_value, traceback): |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
43 L("Exiting, cleanup handler"); |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
44 self.fridge.off() |
| 439 | 45 |
| 444 | 46 def run(self): |
|
448
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
47 |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
48 if self.fridge is None: |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
49 raise Exception("Tempserver.run() must be within 'with Tempserver() as server'") |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
50 |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
51 # XXX do these go here or in __enter_() ? |
|
fe729664a5e6
working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents:
447
diff
changeset
|
52 self.start_time = self.now() |
| 533 | 53 runloops = [ |
| 527 | 54 self.fridge.run(), |
| 55 self.sensors.run(), | |
| 56 self.uploader.run(), | |
|
551
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
57 self.configwaiter.run(), |
| 533 | 58 ] |
| 531 | 59 |
| 527 | 60 loop = asyncio.get_event_loop() |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
61 try: |
| 533 | 62 loop.run_until_complete(asyncio.gather(*runloops)) |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
63 except KeyboardInterrupt: |
| 533 | 64 print('\nctrl-c') |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
65 finally: |
| 533 | 66 # loop.close() seems necessary otherwise get warnings about signal handlers |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
67 loop.close() |
| 444 | 68 |
| 69 def now(self): | |
| 70 return utils.monotonic_time() | |
| 71 | |
| 443 | 72 def set_sensors(self, sensors): |
| 447 | 73 if hasattr(self, 'sensors'): |
| 443 | 74 self.sensors.kill() |
| 75 self.sensors = sensors | |
| 76 self.wort_name = sensors.wort_name() | |
| 77 self.fridge_name = sensors.fridge_name() | |
| 439 | 78 |
| 79 def take_readings(self): | |
| 80 ret = self.readings | |
| 81 self.readings = [] | |
| 82 return ret | |
| 83 | |
| 84 def pushfront(self, readings): | |
| 85 """ used if a caller of take_readings() fails """ | |
| 459 | 86 self.readings = readings + self.readings |
| 439 | 87 |
| 443 | 88 # a reading is a map of {sensorname: value}. temperatures |
| 89 # are float degrees | |
| 439 | 90 def add_reading(self, reading): |
| 91 """ adds a reading at the current time """ | |
| 454 | 92 D("add_reading(%s)" % str(reading)) |
| 444 | 93 self.readings.append( (reading, self.now())) |
| 443 | 94 self.current = (reading.get(self.wort_name, None), |
| 95 reading.get(self.fridge_name, None)) | |
| 459 | 96 if len(self.readings) > config.MAX_READINGS: |
| 97 self.readings = self.readings[-config.MAX_READINGS:] | |
| 439 | 98 |
| 99 def current_temps(self): | |
| 443 | 100 """ returns (wort_temp, fridge_temp) tuple """ |
| 531 | 101 D("current: %s" % str(self.current)) |
| 447 | 102 return self.current |
| 444 | 103 |
| 531 | 104 @asyncio.coroutine |
|
518
0b5ff341d124
sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents:
514
diff
changeset
|
105 def sleep(self, timeout): |
|
0b5ff341d124
sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents:
514
diff
changeset
|
106 """ sleeps for timeout seconds, though wakes if the server's config is updated """ |
| 531 | 107 # XXX fixme - we should wake on _wakeup but asyncio Condition with wait_for is a bit broken? |
| 108 # https://groups.google.com/forum/#!topic/python-tulip/eSm7rZAe9LM | |
| 109 # For now we just sleep, ignore the _wakeup | |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
110 try: |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
111 yield from asyncio.wait_for(self._wakeup.wait(), timeout=timeout) |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
112 except asyncio.TimeoutError: |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
113 pass |
| 533 | 114 |
|
551
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
115 def reload_signal(self, no_file = False): |
|
518
0b5ff341d124
sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents:
514
diff
changeset
|
116 try: |
|
551
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
117 if not no_file: |
|
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
118 self.params.load() |
|
9499bd2f344b
long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents:
533
diff
changeset
|
119 L("Reloaded.") |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
120 self._wakeup.set() |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
121 self._wakeup.clear() |
| 528 | 122 except Error as e: |
|
518
0b5ff341d124
sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents:
514
diff
changeset
|
123 W("Problem reloading: %s" % str(e)) |
|
0b5ff341d124
sleep on a semaphore so it can start/stop immediately when there's a SIGHUP
Matt Johnston <matt@ucc.asn.au>
parents:
514
diff
changeset
|
124 |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
125 def test_mode(self): |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
126 return self._test_mode |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
127 |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
128 def setup_logging(debug = False): |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
129 level = logging.INFO |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
130 if debug: |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
131 level = logging.DEBUG |
| 444 | 132 logging.basicConfig(format='%(asctime)s %(message)s', |
| 133 datefmt='%m/%d/%Y %I:%M:%S %p', | |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
134 level=level) |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
135 #logging.getLogger("asyncio").setLevel(logging.DEBUG) |
| 444 | 136 |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
137 def start(test_mode): |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
138 with Tempserver(test_mode) as server: |
|
461
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
139 server.run() |
|
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
140 |
| 444 | 141 def main(): |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
142 parser = argparse.ArgumentParser() |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
143 parser.add_argument('--hup', action='store_true') |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
144 parser.add_argument('--new', action='store_true') |
| 556 | 145 parser.add_argument('-D', '--daemon', action='store_true') |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
146 parser.add_argument('-d', '--debug', action='store_true') |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
147 parser.add_argument('-t', '--test', action='store_true') |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
148 args = parser.parse_args() |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
149 |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
150 setup_logging(args.debug) |
| 444 | 151 |
|
473
bd29ddb360a5
fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents:
471
diff
changeset
|
152 heredir = os.path.abspath(os.path.dirname(__file__)) |
|
bd29ddb360a5
fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents:
471
diff
changeset
|
153 pidpath = os.path.join(heredir, 'tempserver.pid') |
| 471 | 154 pidf = lockfile.pidlockfile.PIDLockFile(pidpath, threaded=False) |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
155 |
|
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
156 |
| 471 | 157 try: |
| 514 | 158 pidf.acquire(1) |
| 471 | 159 pidf.release() |
| 528 | 160 except (lockfile.AlreadyLocked, lockfile.LockTimeout) as e: |
| 471 | 161 pid = pidf.read_pid() |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
162 if args.hup: |
| 499 | 163 try: |
| 164 os.kill(pid, signal.SIGHUP) | |
| 529 | 165 print("Sent SIGHUP to process %d" % pid, file=sys.stderr) |
| 499 | 166 sys.exit(0) |
| 167 except OSError: | |
| 529 | 168 print("Process %d isn't running?" % pid, file=sys.stderr) |
| 499 | 169 sys.exit(1) |
| 170 | |
| 529 | 171 print("Locked by PID %d" % pid, file=sys.stderr) |
| 499 | 172 |
| 498 | 173 stale = False |
| 471 | 174 if pid > 0: |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
175 if args.new: |
| 498 | 176 try: |
| 177 os.kill(pid, 0) | |
| 178 except OSError: | |
| 179 stale = True | |
| 180 | |
| 181 if not stale: | |
| 529 | 182 print("Stopping old tempserver pid %d" % pid, file=sys.stderr) |
| 498 | 183 os.kill(pid, signal.SIGTERM) |
| 184 time.sleep(2) | |
| 185 pidf.acquire(0) | |
| 186 pidf.release() | |
| 187 else: | |
| 188 try: | |
| 189 os.kill(pid, 0) | |
| 190 # must still be running PID | |
| 191 raise e | |
| 192 except OSError: | |
| 193 stale = True | |
| 194 | |
| 195 if stale: | |
| 196 # isn't still running, steal the lock | |
| 529 | 197 print("Unlinking stale lockfile %s for pid %d" % (pidpath, pid), file=sys.stderr) |
| 498 | 198 pidf.break_lock() |
|
461
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
199 |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
200 if args.hup: |
| 529 | 201 print("Doesn't seem to be running", file=sys.stderr) |
| 499 | 202 sys.exit(1) |
| 203 | |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
204 if args.daemon: |
|
461
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
205 logpath = os.path.join(os.path.dirname(__file__), 'tempserver.log') |
|
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
206 logf = open(logpath, 'a+') |
|
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
207 with daemon.DaemonContext(pidfile=pidf, stdout=logf, stderr = logf): |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
208 start(args.test) |
|
461
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
209 else: |
|
1eb68df9f8ab
Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents:
459
diff
changeset
|
210 with pidf: |
|
532
9b1d71310c83
better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents:
531
diff
changeset
|
211 start(args.test) |
| 444 | 212 |
| 213 if __name__ == '__main__': | |
| 214 main() |