annotate py/tempserver.py @ 529:5201f441bf4a

run 2to3
author Matt Johnston <matt@ucc.asn.au>
date Fri, 10 Apr 2015 23:59:16 +0800
parents 61e61de49a50
children e39ed85d87a5
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
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
9
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
10 import lockfile.pidlockfile
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
11 import daemon
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
12
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
13 import utils
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
14 from utils import L,D,EX,W
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
15 import fridge
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
16 import config
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
17 import sensor_ds18b20
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
18 import params
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
19 import uploader
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
20
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22 class Tempserver(object):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23 def __init__(self):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24 self.readings = []
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
25 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
26 self.fridge = None
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
27 self._wakeup = asyncio.Event()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
28
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
29 def __enter__(self):
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
30 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
31 self.fridge = fridge.Fridge(self)
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
32 self.uploader = uploader.Uploader(self)
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
33 self.params.load()
528
61e61de49a50 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
34 self.set_sensors(sensor.make_sensor(self))
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
35 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
36 return self
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
37
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
38 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
39 L("Exiting, cleanup handler");
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
40 self.fridge.off()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
41
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
42 def run(self):
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
43
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
44 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
45 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
46
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
47 # 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
48 self.start_time = self.now()
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
49 tasks = (
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
50 self.fridge.run(),
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
51 self.sensors.run(),
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
52 self.uploader.run(),
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
53 )
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
54 loop = asyncio.get_event_loop()
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
55 try:
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
56 loop.run_until_complete(asyncio.wait(tasks))
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
57 # not reached
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
58 except KeyboardInterrupt:
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
59 pass
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
60
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
61 def now(self):
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
62 return utils.monotonic_time()
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
63
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
64 def set_sensors(self, sensors):
447
8fdf86ea41e7 few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 444
diff changeset
65 if hasattr(self, 'sensors'):
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
66 self.sensors.kill()
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
67 self.sensors = sensors
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
68 self.wort_name = sensors.wort_name()
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
69 self.fridge_name = sensors.fridge_name()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
70
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
71 def take_readings(self):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
72 ret = self.readings
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
73 self.readings = []
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
74 return ret
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 pushfront(self, readings):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
77 """ used if a caller of take_readings() fails """
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
78 self.readings = readings + self.readings
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
79
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
80 # 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
81 # are float degrees
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
82 def add_reading(self, reading):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
83 """ adds a reading at the current time """
454
dce9f7841696 rough touch sensor
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
84 D("add_reading(%s)" % str(reading))
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
85 self.readings.append( (reading, self.now()))
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
86 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
87 reading.get(self.fridge_name, None))
459
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
88 if len(self.readings) > config.MAX_READINGS:
c34083c078db uploader works
Matt Johnston <matt@ucc.asn.au>
parents: 456
diff changeset
89 self.readings = self.readings[-config.MAX_READINGS:]
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
90
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
91 def current_temps(self):
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
92 """ returns (wort_temp, fridge_temp) tuple """
447
8fdf86ea41e7 few updates, seems to run
Matt Johnston <matt@ucc.asn.au>
parents: 444
diff changeset
93 return self.current
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
94
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
95 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
96 """ sleeps for timeout seconds, though wakes if the server's config is updated """
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
97 asyncio.wait_for(self._wakeup, timeout=timeout)
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
98
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
99 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
100 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
101 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
102 L("Reloaded.")
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 self._wakeup.set()
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
104 self._wakeup.clear()
528
61e61de49a50 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
105 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
106 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
107
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
108 def setup_logging():
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
109 logging.basicConfig(format='%(asctime)s %(message)s',
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
110 datefmt='%m/%d/%Y %I:%M:%S %p',
462
a91adc95543d less verbose logging
Matt Johnston <matt@ucc.asn.au>
parents: 461
diff changeset
111 level=logging.INFO)
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
112
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
113 def start():
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
114 with Tempserver() as server:
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
115 server.run()
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
116
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
117 def main():
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 447
diff changeset
118 setup_logging()
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
119
473
bd29ddb360a5 fix to absolute path for lockfile, --daemon does chdir("/")
Matt Johnston <matt@ucc.asn.au>
parents: 471
diff changeset
120 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
121 pidpath = os.path.join(heredir, 'tempserver.pid')
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
122 pidf = lockfile.pidlockfile.PIDLockFile(pidpath, threaded=False)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
123 do_hup = '--hup' in sys.argv
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
124 try:
514
0c29d1a16c8c fix pid locking
Matt Johnston <matt@ucc.asn.au>
parents: 499
diff changeset
125 pidf.acquire(1)
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
126 pidf.release()
528
61e61de49a50 test sensor
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
127 except (lockfile.AlreadyLocked, lockfile.LockTimeout) as e:
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
128 pid = pidf.read_pid()
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
129 if do_hup:
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
130 try:
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
131 os.kill(pid, signal.SIGHUP)
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
132 print("Sent SIGHUP to process %d" % pid, file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
133 sys.exit(0)
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
134 except OSError:
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
135 print("Process %d isn't running?" % pid, file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
136 sys.exit(1)
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
137
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
138 print("Locked by PID %d" % pid, file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
139
498
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
140 stale = False
471
4414bf8dddaa use better pidlockfile
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
141 if pid > 0:
498
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
142 if '--new' in sys.argv:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
143 try:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
144 os.kill(pid, 0)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
145 except OSError:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
146 stale = True
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
147
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
148 if not stale:
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
149 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
150 os.kill(pid, signal.SIGTERM)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
151 time.sleep(2)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
152 pidf.acquire(0)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
153 pidf.release()
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
154 else:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
155 try:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
156 os.kill(pid, 0)
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
157 # must still be running PID
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
158 raise e
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
159 except OSError:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
160 stale = True
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
161
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
162 if stale:
ccc2915b2dd9 Add --new flag
Matt Johnston <matt@ucc.asn.au>
parents: 473
diff changeset
163 # isn't still running, steal the lock
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
164 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
165 pidf.break_lock()
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
166
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
167 if do_hup:
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 528
diff changeset
168 print("Doesn't seem to be running", file=sys.stderr)
499
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
169 sys.exit(1)
4a8a1e886a8c add --hup
Matt Johnston <matt@ucc.asn.au>
parents: 498
diff changeset
170
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
171 if '--daemon' in sys.argv:
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
172 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
173 logf = open(logpath, 'a+')
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
174 with daemon.DaemonContext(pidfile=pidf, stdout=logf, stderr = logf):
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
175 start()
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
176 else:
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
177 with pidf:
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 459
diff changeset
178 start()
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
179
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
180 if __name__ == '__main__':
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
181 main()