Mercurial > code > home > repos > homeauto
annotate service/piNode/piNode.py @ 1356:35090659d414
fix /static path dir
Ignore-this: 464d6e4dfc28f03240fde8cf1f047e41
darcs-hash:a16cad68206967fd7e85e2fe66d07e5cba279b6f
author | drewp <drewp@bigasterisk.com> |
---|---|
date | Thu, 25 Apr 2019 23:52:22 -0700 |
parents | f2159312b0e7 |
children | f397ec8bd13d |
rev | line source |
---|---|
987 | 1 from __future__ import division |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
2 import sys, logging, socket, json, time, pkg_resources |
987 | 3 import cyclone.web |
1056
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
4 from cyclone.httpclient import fetch |
1031
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
5 from rdflib import Namespace, URIRef, Literal, Graph, RDF, ConjunctiveGraph |
989
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
6 from rdflib.parser import StringInputSource |
987 | 7 from twisted.internet import reactor, task |
1152 | 8 from twisted.internet.threads import deferToThread |
987 | 9 from docopt import docopt |
1152 | 10 import etcd3 |
1269
73b6ed12bae6
stats handler, events output fix, build updaets
drewp <drewp@bigasterisk.com>
parents:
1211
diff
changeset
|
11 from greplin import scales |
73b6ed12bae6
stats handler, events output fix, build updaets
drewp <drewp@bigasterisk.com>
parents:
1211
diff
changeset
|
12 from greplin.scales.cyclonehandler import StatsHandler |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
13 |
987 | 14 logging.basicConfig(level=logging.DEBUG) |
1136
1e43ec4a5f23
build and import updates for rdfdb, etc
drewp <drewp@bigasterisk.com>
parents:
1130
diff
changeset
|
15 |
1e43ec4a5f23
build and import updates for rdfdb, etc
drewp <drewp@bigasterisk.com>
parents:
1130
diff
changeset
|
16 sys.path.append("../../lib") |
1031
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
17 from patchablegraph import PatchableGraph, CycloneGraphHandler, CycloneGraphEventsHandler |
1143
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
18 |
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
19 from rdfdb.rdflibpatch import inContext |
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
20 from rdfdb.patch import Patch |
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
21 |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
22 try: |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
23 import pigpio |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
24 except ImportError: |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
25 class pigpio(object): |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
26 @staticmethod |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
27 def pi(): |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
28 return None |
987 | 29 |
30 import devices | |
1098
b5906f6fce3f
save data to influxdb, not graphite
drewp <drewp@bigasterisk.com>
parents:
1076
diff
changeset
|
31 from export_to_influxdb import InfluxExporter |
1026
8e075449ba0a
piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents:
1025
diff
changeset
|
32 |
987 | 33 log = logging.getLogger() |
34 logging.getLogger('serial').setLevel(logging.WARN) | |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
35 |
987 | 36 ROOM = Namespace('http://projects.bigasterisk.com/room/') |
37 HOST = Namespace('http://bigasterisk.com/ruler/host/') | |
38 | |
39 hostname = socket.gethostname() | |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
40 CTX = ROOM['pi/%s' % hostname] |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
41 |
1269
73b6ed12bae6
stats handler, events output fix, build updaets
drewp <drewp@bigasterisk.com>
parents:
1211
diff
changeset
|
42 STATS = scales.collection('/root', |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
43 scales.PmfStat('configReread'), |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
44 scales.IntStat('pollException'), |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
45 scales.PmfStat('boardPoll'), |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
46 scales.PmfStat('sendOneshot'), |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
47 scales.PmfStat('outputStatements'), |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
48 |
1269
73b6ed12bae6
stats handler, events output fix, build updaets
drewp <drewp@bigasterisk.com>
parents:
1211
diff
changeset
|
49 ) |
1063 | 50 def patchRandid(): |
51 """ | |
52 I'm concerned urandom is slow on raspberry pi, and I'm adding to | |
53 graphs a lot. Unclear what the ordered return values might do to | |
54 the balancing of the graph. | |
55 """ | |
56 _id_serial = [1000] | |
57 def randid(): | |
58 _id_serial[0] += 1 | |
59 return _id_serial[0] | |
60 import rdflib.plugins.memory | |
61 rdflib.plugins.memory.randid = randid | |
62 patchRandid() | |
63 | |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
64 class Config(object): |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
65 def __init__(self, masterGraph, hubHost): |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
66 self.etcd = etcd3.client(host=hubHost, port=9022) |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
67 |
1152 | 68 self.masterGraph = masterGraph |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
69 self.hubHost = hubHost |
1152 | 70 self.configGraph = ConjunctiveGraph() |
71 self.boards = [] | |
72 self.etcPrefix = 'pi/' | |
73 | |
74 self.reread() | |
75 | |
76 deferToThread(self.watchEtcd) | |
77 | |
78 def watchEtcd(self): | |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
79 events, cancel = self.etcd.watch_prefix(self.etcPrefix) |
1152 | 80 reactor.addSystemEventTrigger('before', 'shutdown', cancel) |
81 for ev in events: | |
82 log.info('%s changed', ev.key) | |
83 reactor.callFromThread(self.configChanged) | |
84 | |
85 def configChanged(self): | |
86 self.cancelRead() | |
87 self.rereadLater = reactor.callLater(.1, self.reread) | |
88 | |
89 def cancelRead(self): | |
90 if getattr(self, 'rereadLater', None): | |
91 self.rereadLater.cancel() | |
92 self.rereadLater = None | |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
93 |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
94 @STATS.configReread.time() |
1152 | 95 def reread(self): |
96 self.rereadLater = None | |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
97 log.info('read config') |
1152 | 98 self.configGraph = ConjunctiveGraph() |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
99 for v, md in self.etcd.get_prefix(self.etcPrefix): |
1152 | 100 log.info(' read file %r', md.key) |
101 self.configGraph.parse(StringInputSource(v), format='n3') | |
102 self.configGraph.bind('', ROOM) | |
103 self.configGraph.bind('rdf', RDF) | |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
104 # config graph is too noisy; maybe make it a separate resource |
1152 | 105 #masterGraph.patch(Patch(addGraph=self.configGraph)) |
106 self.setupBoards() | |
107 | |
108 def setupBoards(self): | |
109 thisHost = Literal(hostname) | |
110 for row in self.configGraph.query( | |
111 'SELECT ?board WHERE { ?board a :PiBoard; :hostname ?h }', | |
112 initBindings=dict(h=thisHost)): | |
113 thisBoard = row.board | |
114 break | |
115 else: | |
116 log.warn("config had no board for :hostname %s. Waiting for config update." % | |
117 thisHost) | |
118 self.boards = [] | |
119 return | |
120 | |
121 log.info("found config for board %r" % thisBoard) | |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
122 self.boards = [Board(self.configGraph, self.masterGraph, thisBoard, self.hubHost)] |
1152 | 123 self.boards[0].startPolling() |
124 | |
987 | 125 |
126 class Board(object): | |
127 """similar to arduinoNode.Board but without the communications stuff""" | |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
128 def __init__(self, graph, masterGraph, uri, hubHost): |
987 | 129 self.graph, self.uri = graph, uri |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
130 self.hubHost = hubHost |
1031
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
131 self.masterGraph = masterGraph |
1154
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
132 self.masterGraph.setToGraph(self.staticStmts()) |
987 | 133 self.pi = pigpio.pi() |
134 self._devs = devices.makeDevices(graph, self.uri, self.pi) | |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
135 log.debug('found %s devices', len(self._devs)) |
987 | 136 self._statementsFromInputs = {} # input device uri: latest statements |
1048
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
137 self._lastPollTime = {} # input device uri: time() |
1098
b5906f6fce3f
save data to influxdb, not graphite
drewp <drewp@bigasterisk.com>
parents:
1076
diff
changeset
|
138 self._influx = InfluxExporter(self.graph) |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
139 for d in self._devs: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
140 self.syncMasterGraphToHostStatements(d) |
1048
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
141 |
987 | 142 def startPolling(self): |
1048
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
143 task.LoopingCall(self._poll).start(.05) |
987 | 144 |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
145 @STATS.boardPoll.time() # not differentiating multiple boards here |
987 | 146 def _poll(self): |
1076
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
147 try: |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
148 self._pollMaybeError() |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
149 except Exception: |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
150 STATS.pollException += 1 |
1076
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
151 log.exception("During poll:") |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
152 |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
153 def _pollMaybeError(self): |
1109
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
154 pollTime = {} # uri: sec |
987 | 155 for i in self._devs: |
1048
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
156 now = time.time() |
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
157 if (hasattr(i, 'pollPeriod') and |
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
158 self._lastPollTime.get(i.uri, 0) + i.pollPeriod > now): |
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
159 continue |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
160 #need something like: |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
161 # with i.pollTiming.time(): |
1048
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
162 new = i.poll() |
1109
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
163 pollTime[i.uri] = time.time() - now |
1056
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
164 if isinstance(new, dict): # new style |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
165 oneshot = new['oneshot'] |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
166 new = new['latest'] |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
167 else: |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
168 oneshot = None |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
169 |
1154
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
170 self._updateMasterWithNewPollStatements(i.uri, new) |
1056
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
171 |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
172 if oneshot: |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
173 self._sendOneshot(oneshot) |
1048
f3c7f617c335
piNode poll switches much faster. mirror the logic in arduinoNode though vari-rate poll is not supported yet
drewp <drewp@bigasterisk.com>
parents:
1038
diff
changeset
|
174 self._lastPollTime[i.uri] = now |
1109
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
175 if log.isEnabledFor(logging.DEBUG): |
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
176 log.debug('poll times:') |
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
177 for u, s in sorted(pollTime.items()): |
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
178 log.debug(" %.4f ms %s", s * 1000, u) |
77f6117e002f
influx output, fade support, switch to Adafruit_DHT, start of Lcd8544
drewp <drewp@bigasterisk.com>
parents:
1098
diff
changeset
|
179 log.debug('total poll time: %f ms', sum(pollTime.values()) * 1000) |
1143
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
180 |
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
181 pollResults = map(set, self._statementsFromInputs.values()) |
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
182 if pollResults: |
d1bc88f67969
RgbPixelsAnimation and docker build updates
drewp <drewp@bigasterisk.com>
parents:
1136
diff
changeset
|
183 self._influx.exportToInflux(set.union(*pollResults)) |
1026
8e075449ba0a
piNode support for temp sensors. proper hostname lookup
drewp <drewp@bigasterisk.com>
parents:
1025
diff
changeset
|
184 |
1154
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
185 def _updateMasterWithNewPollStatements(self, dev, new): |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
186 prev = self._statementsFromInputs.get(dev, set()) |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
187 |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
188 # it's important that quads from different devices |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
189 # don't clash, since that can lead to inconsistent |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
190 # patches (e.g. |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
191 # dev1 changes value from 1 to 2; |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
192 # dev2 changes value from 2 to 3; |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
193 # dev1 changes from 2 to 4 but this patch will |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
194 # fail since the '2' statement is gone) |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
195 self.masterGraph.patch(Patch.fromDiff(inContext(prev, dev), |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
196 inContext(new, dev))) |
5da3a85b59e4
more robust about not accumulating old stmts
drewp <drewp@bigasterisk.com>
parents:
1152
diff
changeset
|
197 self._statementsFromInputs[dev] = new |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
198 |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
199 @STATS.sendOneshot.time() |
1056
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
200 def _sendOneshot(self, oneshot): |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
201 body = (' '.join('%s %s %s .' % (s.n3(), p.n3(), o.n3()) |
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
202 for s,p,o in oneshot)).encode('utf8') |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
203 url = 'http://%s:9071/oneShot' % self.hubHost |
1076
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
204 d = fetch(method='POST', |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
205 url=url, |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
206 headers={'Content-Type': ['text/n3']}, |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
207 postdata=body, |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
208 timeout=5) |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
209 def err(e): |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
210 log.info('oneshot post to %r failed: %s', |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
211 url, e.getErrorMessage()) |
d0ca77a3faf4
rewrite oneShotPost to ease debugging. add try-block around polling
drewp <drewp@bigasterisk.com>
parents:
1074
diff
changeset
|
212 d.addErrback(err) |
1056
d2007482aec5
start sending oneshot events from some devices
drewp <drewp@bigasterisk.com>
parents:
1048
diff
changeset
|
213 |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
214 @STATS.outputStatements.time() |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
215 def outputStatements(self, stmts): |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
216 unused = set(stmts) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
217 for dev in self._devs: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
218 stmtsForDev = [] |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
219 for pat in dev.outputPatterns(): |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
220 if [term is None for term in pat] != [False, False, True]: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
221 raise NotImplementedError |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
222 for stmt in stmts: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
223 if stmt[:2] == pat[:2]: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
224 stmtsForDev.append(stmt) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
225 unused.discard(stmt) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
226 if stmtsForDev: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
227 log.info("output goes to action handler for %s" % dev.uri) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
228 dev.sendOutput(stmtsForDev) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
229 |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
230 # Dev *could* change hostStatements at any time, and |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
231 # we're not currently tracking that, but the usual is |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
232 # to change them in response to sendOutput so this |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
233 # should be good enough. The right answer is to give |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
234 # each dev the masterGraph for it to write to. |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
235 self.syncMasterGraphToHostStatements(dev) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
236 log.info("output and masterGraph sync complete") |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
237 if unused: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
238 log.info("Board %s doesn't care about these statements:", self.uri) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
239 for s in unused: |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
240 log.warn("%r", s) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
241 |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
242 def syncMasterGraphToHostStatements(self, dev): |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
243 hostStmtCtx = URIRef(dev.uri + '/host') |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
244 newQuads = inContext(dev.hostStatements(), hostStmtCtx) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
245 p = self.masterGraph.patchSubgraph(hostStmtCtx, newQuads) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
246 log.debug("patch master with these host stmts %s", p) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
247 |
1031
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
248 def staticStmts(self): |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
249 return [(HOST[hostname], ROOM['connectedTo'], self.uri, CTX)] |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
250 |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
251 def description(self): |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
252 """for web page""" |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
253 return { |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
254 'uri': self.uri, |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
255 'devices': [d.description() for d in self._devs], |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
256 'graph': 'http://sticker:9059/graph', #todo |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
257 } |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
258 |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
259 class Dot(cyclone.web.RequestHandler): |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
260 def get(self): |
1152 | 261 configGraph = self.settings.config.configGraph |
262 dot = dotrender.render(configGraph, self.settings.config.boards) | |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
263 self.write(dot) |
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
264 |
989
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
265 def rdfGraphBody(body, headers): |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
266 g = Graph() |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
267 g.parse(StringInputSource(body), format='nt') |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
268 return g |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
269 |
987 | 270 class OutputPage(cyclone.web.RequestHandler): |
271 def put(self): | |
989
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
272 arg = self.request.arguments |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
273 if arg.get('s') and arg.get('p'): |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
274 subj = URIRef(arg['s'][-1]) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
275 pred = URIRef(arg['p'][-1]) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
276 turtleLiteral = self.request.body |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
277 try: |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
278 obj = Literal(float(turtleLiteral)) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
279 except ValueError: |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
280 obj = Literal(turtleLiteral) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
281 stmt = (subj, pred, obj) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
282 else: |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
283 g = rdfGraphBody(self.request.body, self.request.headers) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
284 assert len(g) == 1, len(g) |
065fc9e07c10
piNode allow nt graphs as the body of a PUT /output
drewp <drewp@bigasterisk.com>
parents:
988
diff
changeset
|
285 stmt = g.triples((None, None, None)).next() |
987 | 286 |
1152 | 287 for b in self.settings.config.boards: |
288 b.outputStatements([stmt]) | |
987 | 289 |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
290 class Boards(cyclone.web.RequestHandler): |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
291 def get(self): |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
292 self.set_header('Content-type', 'application/json') |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
293 self.write(json.dumps({ |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
294 'host': hostname, |
1152 | 295 'boards': [b.description() for b in self.settings.config.boards] |
988
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
296 }, indent=2)) |
63c172316239
get piNode working, for motionsensor at least
drewp <drewp@bigasterisk.com>
parents:
987
diff
changeset
|
297 |
987 | 298 def main(): |
299 arg = docopt(""" | |
300 Usage: piNode.py [options] | |
301 | |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
302 -v Verbose |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
303 --ow Just report onewire device URIs and readings, then exit. |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
304 --hub=HOST Hostname for etc3 and oneshot posts. [default: bang.vpn-home.bigasterisk.com] |
987 | 305 """) |
306 log.setLevel(logging.WARN) | |
307 if arg['-v']: | |
308 from twisted.python import log as twlog | |
309 twlog.startLogging(sys.stdout) | |
310 | |
311 log.setLevel(logging.DEBUG) | |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
312 |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
313 if arg['--ow']: |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
314 log.setLevel(logging.INFO) |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
315 for stmt in devices.OneWire().poll(): |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
316 print stmt |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
317 return |
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
318 |
1031
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
319 masterGraph = PatchableGraph() |
1211
8512001ae0a1
cmdline flag on piNode to pick hub host
drewp <drewp@bigasterisk.com>
parents:
1187
diff
changeset
|
320 config = Config(masterGraph, arg['--hub']) |
987 | 321 |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
322 static = pkg_resources.resource_filename('homeauto_anynode', 'static/') |
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
323 |
987 | 324 reactor.listenTCP(9059, cyclone.web.Application([ |
325 (r"/()", cyclone.web.StaticFileHandler, { | |
1355
f2159312b0e7
update build and deps to use invoke and to use new lib layout, plus more stats collection
drewp <drewp@bigasterisk.com>
parents:
1269
diff
changeset
|
326 "path": static, "default_filename": "index.html"}), |
1356 | 327 (r'/static/(.*)', cyclone.web.StaticFileHandler, {"path": static}), |
1269
73b6ed12bae6
stats handler, events output fix, build updaets
drewp <drewp@bigasterisk.com>
parents:
1211
diff
changeset
|
328 (r'/stats/(.*)', StatsHandler, {'serverName': 'piNode'}), |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
329 (r'/boards', Boards), |
1031
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
330 (r"/graph", CycloneGraphHandler, {'masterGraph': masterGraph}), |
9328df09f679
piNode uses new graph SSE code
drewp <drewp@bigasterisk.com>
parents:
1030
diff
changeset
|
331 (r"/graph/events", CycloneGraphEventsHandler, {'masterGraph': masterGraph}), |
987 | 332 (r'/output', OutputPage), |
1038
ffe6a00c6cef
server/browser graph sync. cut dependency on the WS version. merge some changes between arduino/pi code.
drewp <drewp@bigasterisk.com>
parents:
1035
diff
changeset
|
333 (r'/dot', Dot), |
1269
73b6ed12bae6
stats handler, events output fix, build updaets
drewp <drewp@bigasterisk.com>
parents:
1211
diff
changeset
|
334 ], config=config, debug=arg['-v']), interface='::') |
1063 | 335 log.warn('serving on 9059') |
987 | 336 reactor.run() |
337 | |
338 main() |