Mercurial > code > home > repos > light9

changeset 1530:a5a44077c54c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs and error msgs Ignore-this: 5c451744c5fa08c4560e45e6a90de4bd
author drewp@bigasterisk.com
date Wed, 10 May 2017 04:03:54 +0000
parents abe692d0a811
children 5a0a775ca9d3
files bin/collector bin/dmxserver bin/subserver light9/networking.py light9/rdfdb/patchreceiver.py
diffstat 5 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/bin/collector	Wed May 10 03:30:00 2017 +0000
+++ b/bin/collector	Wed May 10 04:03:54 2017 +0000
@@ -63,14 +63,17 @@
     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)
     
--- a/bin/dmxserver	Wed May 10 03:30:00 2017 +0000
+++ b/bin/dmxserver	Wed May 10 04:03:54 2017 +0000
@@ -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
--- a/bin/subserver	Wed May 10 03:30:00 2017 +0000
+++ b/bin/subserver	Wed May 10 04:03:54 2017 +0000
@@ -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
--- a/light9/networking.py	Wed May 10 03:30:00 2017 +0000
+++ b/light9/networking.py	Wed May 10 04:03:54 2017 +0000
@@ -12,7 +12,8 @@
         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
--- a/light9/rdfdb/patchreceiver.py	Wed May 10 03:30:00 2017 +0000
+++ b/light9/rdfdb/patchreceiver.py	Wed May 10 04:03:54 2017 +0000
@@ -38,7 +38,7 @@
             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)