diff --git a/bin/collector b/bin/collector --- a/bin/collector +++ b/bin/collector @@ -63,14 +63,17 @@ def startZmq(port, collector): s.onPull = onPull def launch(graph, doLoadTest=False): - - # todo: drive outputs with config files - outputs = [ - EnttecDmx(L9['output/dmx0/'], '/dev/dmx0', 80), - Udmx(L9['output/udmx/'], 510), - ] + try: + # todo: drive outputs with config files + outputs = [ + #EnttecDmx(L9['output/dmx0/'], '/dev/dmx0', 80), + Udmx(L9['output/udmx/'], 510), + ] + except Exception as e: + log.error("setting up outputs: %r", e) + traceback.print_exc() + raise c = Collector(graph, outputs) - server = WebServer(c) startZmq(networking.collectorZmq.port, c) diff --git a/bin/dmxserver b/bin/dmxserver --- a/bin/dmxserver +++ b/bin/dmxserver @@ -1,5 +1,7 @@ #!bin/python """ +Replaced by bin/collector + this is the only process to talk to the dmx hardware. other clients can connect to this server and present dmx output, and this server diff --git a/bin/subserver b/bin/subserver --- a/bin/subserver +++ b/bin/subserver @@ -1,7 +1,7 @@ #!bin/python """ live web display of all existing subs with pictures, mainly for -dragging them into CC +dragging them into CC or Timeline """ from run_local import log import sys, optparse, logging, json, subprocess, datetime diff --git a/light9/networking.py b/light9/networking.py --- a/light9/networking.py +++ b/light9/networking.py @@ -12,7 +12,8 @@ class ServiceAddress(object): net = graph.value(showUri(), L9['networking']) ret = graph.value(net, self.service) if ret is None: - raise ValueError("no url for %s %s" % (showUri(), L9['networking'])) + raise ValueError("no url for %s -> %s -> %s" % (showUri(), L9['networking'], + self.service)) return str(ret) @property diff --git a/light9/rdfdb/patchreceiver.py b/light9/rdfdb/patchreceiver.py --- a/light9/rdfdb/patchreceiver.py +++ b/light9/rdfdb/patchreceiver.py @@ -38,7 +38,7 @@ class PatchReceiver(object): postdata=body, ).addCallbacks(self._done, lambda err: self._registerError(err, url, body)) - log.info("registering with rdfdb") + log.info("registering with rdfdb at %s", url) def _registerError(self, err, url, body): log.error('registering to url=%r body=%r', url, body)