annotate py/tempserver.py @ 568:8eb16d97ed2b

more logging of overshoot
author Matt Johnston <matt@ucc.asn.au>
date Tue, 10 Nov 2015 23:25:03 +0800
parents 87d064493714
children 02aff9ff8d24
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
447
8fdf86ea41e7 few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 444
diff changeset
1 #!/home/matt/templog/venv/bin/python
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 import sys
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
6 import time
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
7 import signal
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
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
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
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
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
13
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
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
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
16 import fridge
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
17 import config
530
73257bae83ea fix a few python3 issues
Matt Johnston <matt@ucc.asn.au>
parents: 529
diff changeset
18 import sensor
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
19 import params
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
20 import uploader
556
c5f8375b12a2 long polling works
Matt Johnston <matt@ucc.asn.au>
parents: 551
diff changeset
21 import configwaiter
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
22
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24 class Tempserver(object):
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
25 def __init__(self, test_mode, nowait):
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26 self.readings = []
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
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
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
31 self._nowait = nowait
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
32
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
33 def __enter__(self):
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
34 self.params = params.Params()
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
35 self.fridge = fridge.Fridge(self, self._nowait)
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
36 self.uploader = uploader.Uploader(self)
551
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
37 self.configwaiter = configwaiter.ConfigWaiter(self)
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
38 self.params.load()
528
61e61de49a50 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
39 self.set_sensors(sensor.make_sensor(self))
551
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
40 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
41 return self
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
42
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
43 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
44 L("Exiting, cleanup handler");
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
45 self.fridge.off()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
46
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
47 def run(self):
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
48
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
49 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
50 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
51
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
52 # 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
53 self.start_time = self.now()
533
815f811f6a65 Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 532
diff changeset
54 runloops = [
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
55 self.fridge.run(),
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
56 self.sensors.run(),
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
57 self.uploader.run(),
551
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
58 self.configwaiter.run(),
533
815f811f6a65 Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 532
diff changeset
59 ]
531
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 530
diff changeset
60
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
61 loop = asyncio.get_event_loop()
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
62 try:
533
815f811f6a65 Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 532
diff changeset
63 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
64 except KeyboardInterrupt:
533
815f811f6a65 Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 532
diff changeset
65 print('\nctrl-c')
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
66 finally:
533
815f811f6a65 Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 532
diff changeset
67 # 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
68 loop.close()
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
69
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
70 def now(self):
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
71 return utils.monotonic_time()
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
72
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
73 def set_sensors(self, sensors):
447
8fdf86ea41e7 few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 444
diff changeset
74 if hasattr(self, 'sensors'):
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
75 self.sensors.kill()
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
76 self.sensors = sensors
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
77 self.wort_name = sensors.wort_name()
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
78 self.fridge_name = sensors.fridge_name()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
79
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
80 def take_readings(self):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
81 ret = self.readings
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
82 self.readings = []
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
83 return ret
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
84
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
85 def pushfront(self, readings):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
86 """ used if a caller of take_readings() fails """
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
87 self.readings = readings + self.readings
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
88
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
89 # a reading is a map of {sensorname: value}. temperatures
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
90 # are float degrees
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
91 def add_reading(self, reading):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
92 """ adds a reading at the current time """
454
dce9f7841696 rough touch sensor
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
93 D("add_reading(%s)" % str(reading))
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
94 self.readings.append( (reading, self.now()))
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
95 self.current = (reading.get(self.wort_name, None),
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
96 reading.get(self.fridge_name, None))
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
97 if len(self.readings) > config.MAX_READINGS:
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
98 self.readings = self.readings[-config.MAX_READINGS:]
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
99
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
100 def current_temps(self):
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
101 """ returns (wort_temp, fridge_temp) tuple """
531
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 530
diff changeset
102 D("current: %s" % str(self.current))
447
8fdf86ea41e7 few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 444
diff changeset
103 return self.current
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
104
531
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 530
diff changeset
105 @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
106 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
107 """ sleeps for timeout seconds, though wakes if the server's config is updated """
531
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 530
diff changeset
108 # XXX fixme - we should wake on _wakeup but asyncio Condition with wait_for is a bit broken?
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 530
diff changeset
109 # https://groups.google.com/forum/#!topic/python-tulip/eSm7rZAe9LM
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 530
diff changeset
110 # 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
111 try:
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
112 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
113 except asyncio.TimeoutError:
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
114 pass
533
815f811f6a65 Fixed some warnings
Matt Johnston <matt@ucc.asn.au>
parents: 532
diff changeset
115
551
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
116 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
117 try:
551
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
118 if not no_file:
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
119 self.params.load()
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 533
diff changeset
120 L("Reloaded.")
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
121 self._wakeup.set()
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
122 self._wakeup.clear()
528
61e61de49a50 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
123 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
124 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
125
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
126 def test_mode(self):
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
127 return self._test_mode
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
128
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
129 def setup_logging(debug = False):
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
130 level = logging.INFO
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
131 if debug:
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
132 level = logging.DEBUG
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
133 logging.basicConfig(format='%(asctime)s %(message)s',
566
87d064493714 fix wrong date format. how'd that slip in.
Matt Johnston <matt@ucc.asn.au>
parents: 565
diff changeset
134 datefmt='%d/%m/%Y %I:%M:%S %p',
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
135 level=level)
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
136 #logging.getLogger("asyncio").setLevel(logging.DEBUG)
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
137
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
138 def start(test_mode, nowait):
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
139 with Tempserver(test_mode, nowait) as server:
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
140 server.run()
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
141
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
142 def main():
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
143 parser = argparse.ArgumentParser()
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
144 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
145 parser.add_argument('--new', action='store_true')
556
c5f8375b12a2 long polling works
Matt Johnston <matt@ucc.asn.au>
parents: 551
diff changeset
146 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
147 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
148 parser.add_argument('-t', '--test', action='store_true')
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
149 parser.add_argument('--nowait', action='store_true')
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
150 args = parser.parse_args()
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
151
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
152 setup_logging(args.debug)
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
153
473
bd29ddb360a5 fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents: 471
diff changeset
154 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
155 pidpath = os.path.join(heredir, 'tempserver.pid')
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
156 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
157
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
158
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
159 try:
514
0c29d1a16c8c fix pid locking
Matt Johnston <matt@ucc.asn.au>
parents: 499
diff changeset
160 pidf.acquire(1)
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
161 pidf.release()
528
61e61de49a50 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
162 except (lockfile.AlreadyLocked, lockfile.LockTimeout) as e:
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
163 pid = pidf.read_pid()
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
164 if args.hup:
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
165 try:
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
166 os.kill(pid, signal.SIGHUP)
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
167 print("Sent SIGHUP to process %d" % pid, file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
168 sys.exit(0)
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
169 except OSError:
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
170 print("Process %d isn't running?" % pid, file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
171 sys.exit(1)
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
172
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
173 print("Locked by PID %d" % pid, file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
174
498
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
175 stale = False
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
176 if pid > 0:
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
177 if args.new:
498
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
178 try:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
179 os.kill(pid, 0)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
180 except OSError:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
181 stale = True
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
182
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
183 if not stale:
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
184 print("Stopping old tempserver pid %d" % pid, file=sys.stderr)
498
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
185 os.kill(pid, signal.SIGTERM)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
186 time.sleep(2)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
187 pidf.acquire(0)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
188 pidf.release()
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
189 else:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
190 try:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
191 os.kill(pid, 0)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
192 # must still be running PID
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
193 raise e
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
194 except OSError:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
195 stale = True
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
196
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
197 if stale:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
198 # isn't still running, steal the lock
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
199 print("Unlinking stale lockfile %s for pid %d" % (pidpath, pid), file=sys.stderr)
498
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
200 pidf.break_lock()
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
201
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
202 if args.hup:
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
203 print("Doesn't seem to be running", file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
204 sys.exit(1)
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
205
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
206 if args.daemon:
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
207 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
208 logf = open(logpath, 'a+')
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
209 with daemon.DaemonContext(pidfile=pidf, stdout=logf, stderr = logf):
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
210 start(args.test, args.nowait)
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
211 else:
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
212 with pidf:
565
26f20cee71be emergency change sensor config
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
213 start(args.test, args.nowait)
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
214
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
215 if __name__ == '__main__':
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
216 main()