annotate py/utils.py @ 576:ecec38cbad33

w1 master dir moved with my new sensor
author Matt Johnston <matt@ucc.asn.au>
date Tue, 17 Nov 2015 22:25:02 +0800
parents 59cb8449ef97
children 9d0313b685ae
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1 import os
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2 import sys
564
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
3 import ctypes
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
4 import time
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
5 import select
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6 import logging
551
9499bd2f344b long polling config updates
Matt Johnston <matt@ucc.asn.au>
parents: 529
diff changeset
7 import binascii
556
c5f8375b12a2 long polling works
Matt Johnston <matt@ucc.asn.au>
parents: 551
diff changeset
8 import json
564
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
9 import datetime
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
10
448
fe729664a5e6 working better. logging works properly, cleanup fridge.off() happens.
Matt Johnston <matt@ucc.asn.au>
parents: 444
diff changeset
11 D = logging.debug
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
12 L = logging.info
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
13 W = logging.warning
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
14 E = logging.error
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
15
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
16 DEFAULT_TRIES = 3
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
17 READLINE_SELECT_TIMEOUT = 1
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
19 def EX(msg, *args, **kwargs):
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
20 kwargs['exc_info'] = True
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
21 logging.error(msg, *args, **kwargs)
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
22
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23 clock_gettime = None
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
24 no_clock_gettime = True
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
25 def monotonic_time():
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26 global clock_gettime
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
27 global no_clock_gettime
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
28 if no_clock_gettime:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29 return time.time()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
30
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
31 class timespec(ctypes.Structure):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
32 _fields_ = [
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
33 ('tv_sec', ctypes.c_long),
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
34 ('tv_nsec', ctypes.c_long)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
35 ]
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
36 if not clock_gettime:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
37 try:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
38 librt = ctypes.CDLL('librt.so.0', use_errno=True)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
39 clock_gettime = librt.clock_gettime
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
40 clock_gettime.argtypes = [ctypes.c_int, ctypes.POINTER(timespec)]
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
41 except:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
42 W("No clock_gettime(), using fake fallback.")
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
43 no_clock_gettime = True
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
44 return time.time()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
45
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
46 t = timespec()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
47 CLOCK_MONOTONIC = 1 # see <linux/time.h>
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
48
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
49 if clock_gettime(CLOCK_MONOTONIC, ctypes.pointer(t)) != 0:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
50 errno_ = ctypes.get_errno()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
51 raise OSError(errno_, os.strerror(errno_))
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
52 return t.tv_sec + t.tv_nsec * 1e-9
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
53
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
54 # decorator, tries a number of times, returns None on failure, sleeps between
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
55 # Must be used as "@retry()" if arguments are defaulted
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
56 def retry(retries=DEFAULT_TRIES, try_time = 1):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
57 def inner(func):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
58 def new_f(*args, **kwargs):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
59 for i in range(retries):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
60 d = func(*args, **kwargs)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
61 if d is not None:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
62 return d
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
63 time.sleep(try_time)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
64 return None
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
65
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
66 new_f.__name__ = func.__name__
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
67 return new_f
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
68 return inner
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
69
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
70 def readline(sock):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
71 timeout = READLINE_SELECT_TIMEOUT
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
72 buf = ''
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
73 while True:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
74 (rlist, wlist, xlist) = select.select([sock], [], [], timeout)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
75 if sock not in rlist:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
76 # hit timeout
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
77 return None
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
78
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
79 c = sock.recv(1)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
80 if c == '':
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
81 # lightblue timeout
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
82 return None
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
83 if c == '\r':
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
84 continue
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
85
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
86 buf += c
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
87 if c == '\n':
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
88 return buf
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
89
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
90 # from http://blog.stalkr.net/2011/04/pctf-2011-32-thats-no-bluetooth.html
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
91 def crc16(buff, crc = 0, poly = 0x8408):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
92 l = len(buff)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
93 i = 0
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
94 while i < l:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
95 ch = ord(buff[i])
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
96 uc = 0
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
97 while uc < 8:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
98 if (crc & 1) ^ (ch & 1):
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
99 crc = (crc >> 1) ^ poly
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
100 else:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
101 crc >>= 1
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
102 ch >>= 1
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
103 uc += 1
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
104 i += 1
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
105 return crc
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
106
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
107 def cheap_daemon():
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
108 L("Daemonising.")
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
109 sys.stdout.flush()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
110 sys.stderr.flush()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
111 out = file('/dev/null', 'a+')
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
112 os.dup2(out.fileno(), sys.stdout.fileno())
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
113 os.dup2(out.fileno(), sys.stderr.fileno())
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
114
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
115 try:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
116 pid = os.fork()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
117 if pid > 0:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
118 sys.exit(0)
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
119 except OSError as e:
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
120 E("Bad fork()")
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
121 sys.exit(1)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
122
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
123 os.setsid()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
124
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
125 try:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
126 pid = os.fork()
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
127 if pid > 0:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
128 sys.exit(0)
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
129 except OSError as e:
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
130 E("Bad fork()")
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
131 sys.exit(1)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
132
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
133 def uptime():
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
134 try:
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
135 return float(open('/proc/uptime', 'r').read().split(' ', 1)[0])
529
5201f441bf4a run 2to3
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
136 except Exception as e:
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
137 return -1
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
138
556
c5f8375b12a2 long polling works
Matt Johnston <matt@ucc.asn.au>
parents: 551
diff changeset
139
c5f8375b12a2 long polling works
Matt Johnston <matt@ucc.asn.au>
parents: 551
diff changeset
140 def json_load_round_float(s, **args):
c5f8375b12a2 long polling works
Matt Johnston <matt@ucc.asn.au>
parents: 551
diff changeset
141 return json.loads(s,parse_float = lambda f: round(float(f), 2), **args)
564
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
142
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
143 class NotTooOften(object):
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
144 """ prevents things happening more than once per limit.
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
145 Isn't monotonic, good enough for logging. eg
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
146 self.logfailure = NotTooOften(180) # 3 minutes
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
147 ...
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
148 if self.logfailure():
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
149 L("blah")
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
150 """
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
151 def __init__(self, limit):
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
152 """ limit is a delay in seconds or TimeDelta """
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
153 if type(limit) is datetime.timedelta:
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
154 self.limit = limit
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
155 else:
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
156 self.limit = datetime.timedelta(seconds=limit)
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
157
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
158 # must be positive
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
159 assert self.limit > datetime.timedelta(0)
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
160 self.last = datetime.datetime(10, 1, 1)
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
161
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
162 def __call__(self):
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
163 if datetime.datetime.now() - self.last > self.limit:
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
164 self.last = datetime.datetime.now()
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
165 return True
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
166
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
167 def log(self, msg):
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
168 """ calls L(msg) if it isn't too often, otherwise D(msg)
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
169 """
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
170 if self():
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
171 L(msg + " (log interval %s)" % str(self.limit))
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
172 else:
59cb8449ef97 Limit log
Matt Johnston <matt@ucc.asn.au>
parents: 556
diff changeset
173 D(msg)