annotate py/tempserver.py @ 533:815f811f6a65

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