To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos-monitor
- browse files at revision 419
- compare with another revision
- download diff
- download tarball
- view history from revision 419
- Committer: teddy at bsnet
- Date: 2010-09-09 18:16:14 UTC
- mfrom: (237.2.35 mandos-empty-device)
- Revision ID: teddy@fukt.bsnet.se-20100909181614-oanlmvkzsiodbo3c
Merge in branch to interpret an empty device name to mean
"autodetect".
"autodetect".
added
removed
mandos-monitor
37
37
urwid.curses_display.curses.A_UNDERLINE |= (
38
38
urwid.curses_display.curses.A_BLINK)
39
39
40
def isoformat_to_datetime(iso):
41
"Parse an ISO 8601 date string to a datetime.datetime()"
42
if not iso:
43
return None
44
d, t = iso.split(u"T", 1)
45
year, month, day = d.split(u"-", 2)
46
hour, minute, second = t.split(u":", 2)
47
second, fraction = divmod(float(second), 1)
48
return datetime.datetime(int(year),
49
int(month),
50
int(day),
51
int(hour),
52
int(minute),
53
int(second), # Whole seconds
54
int(fraction*1000000)) # Microseconds
55
40
56
class MandosClientPropertyCache(object):
41
57
"""This wraps a Mandos Client D-Bus proxy object, caches the
42
58
properties and calls a hook function when any of them are
50
66
self.property_changed,
51
67
client_interface,
52
68
byte_arrays=True)
53
69
54
70
self.properties.update(
55
71
self.proxy.GetAll(client_interface,
56
72
dbus_interface = dbus.PROPERTIES_IFACE))
80
96
# Logger
81
97
self.logger = logger
82
98
99
self._update_timer_callback_tag = None
100
self.last_checker_failed = False
101
83
102
# The widget shown normally
84
103
self._text_widget = urwid.Text(u"")
85
104
# The widget shown when we have focus
105
124
self.rejected,
106
125
client_interface,
107
126
byte_arrays=True)
127
last_checked_ok = isoformat_to_datetime(self.properties
128
["last_checked_ok"])
129
if last_checked_ok is None:
130
self.last_checker_failed = True
131
else:
132
self.last_checker_failed = ((datetime.datetime.utcnow()
133
- last_checked_ok)
134
> datetime.timedelta
135
(milliseconds=
136
self.properties["interval"]))
137
if self.last_checker_failed:
138
self._update_timer_callback_tag = (gobject.timeout_add
139
(1000,
140
self.update_timer))
108
141
109
142
def checker_completed(self, exitstatus, condition, command):
110
143
if exitstatus == 0:
144
if self.last_checker_failed:
145
self.last_checker_failed = False
146
gobject.source_remove(self._update_timer_callback_tag)
147
self._update_timer_callback_tag = None
111
148
self.logger(u'Checker for client %s (command "%s")'
112
149
u' was successful'
113
150
% (self.properties[u"name"], command))
151
self.update()
114
152
return
153
# Checker failed
154
if not self.last_checker_failed:
155
self.last_checker_failed = True
156
self._update_timer_callback_tag = (gobject.timeout_add
157
(1000,
158
self.update_timer))
115
159
if os.WIFEXITED(condition):
116
160
self.logger(u'Checker for client %s (command "%s")'
117
161
u' failed with exit code %s'
118
162
% (self.properties[u"name"], command,
119
163
os.WEXITSTATUS(condition)))
120
return
121
if os.WIFSIGNALED(condition):
164
elif os.WIFSIGNALED(condition):
122
165
self.logger(u'Checker for client %s (command "%s")'
123
166
u' was killed by signal %s'
124
167
% (self.properties[u"name"], command,
125
168
os.WTERMSIG(condition)))
126
return
127
if os.WCOREDUMP(condition):
169
elif os.WCOREDUMP(condition):
128
170
self.logger(u'Checker for client %s (command "%s")'
129
171
u' dumped core'
130
172
% (self.properties[u"name"], command))
131
self.logger(u'Checker for client %s completed mysteriously')
173
else:
174
self.logger(u'Checker for client %s completed mysteriously')
175
self.update()
132
176
133
177
def checker_started(self, command):
134
178
self.logger(u'Client %s started checker "%s"'
170
214
}
171
215
172
216
# Rebuild focus and non-focus widgets using current properties
173
self._text = (u'%(name)s: %(enabled)s'
217
self._text = (u'%(name)s: %(enabled)s%(timer)s'
174
218
% { u"name": self.properties[u"name"],
175
219
u"enabled":
176
220
(u"enabled"
177
221
if self.properties[u"enabled"]
178
else u"DISABLED")})
222
else u"DISABLED"),
223
u"timer": (unicode(datetime.timedelta
224
(milliseconds =
225
self.properties
226
[u"timeout"])
227
- (datetime.datetime
228
.utcnow()
229
- isoformat_to_datetime
230
(max((self.properties
231
["last_checked_ok"]
232
or
233
self.properties
234
["created"]),
235
self.properties[u"last_enabled"]))))
236
if (self.last_checker_failed
237
and self.properties
238
[u"enabled"])
239
else u"")})
179
240
if not urwid.supports_unicode():
180
241
self._text = self._text.encode("ascii", "replace")
181
242
textlist = [(u"normal", self._text)]
192
253
if self.update_hook is not None:
193
254
self.update_hook()
194
255
256
def update_timer(self):
257
"called by gobject"
258
self.update()
259
return True # Keep calling this
260
195
261
def delete(self):
262
if self._update_timer_callback_tag is not None:
263
gobject.source_remove(self._update_timer_callback_tag)
264
self._update_timer_callback_tag = None
196
265
if self.delete_hook is not None:
197
266
self.delete_hook(self)
198
267
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0