Mercurial > code > home > repos > light9

changeset 1801:6b101309fb12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
collector logging Ignore-this: b6ed23697ded6a40151ff0cca98b334
author drewp@bigasterisk.com
date Fri, 08 Jun 2018 05:40:02 +0000
parents 626a79891061
children 3ffadb9f00cd
files bin/collector light9/collector/output.py
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bin/collector	Fri Jun 08 03:36:13 2018 +0000
+++ b/bin/collector	Fri Jun 08 05:40:02 2018 +0000
@@ -66,7 +66,7 @@
         
     def addClient(self, client):
         self.clients.append([client, {}]) # seen = {dev: attrs}
-        log.info('added client %s', client)
+        log.info('added client %s %s', len(clients), client)
 
     def delClient(self, client):
         self.clients = [[c, t] for c, t in self.clients if c != client]
--- a/light9/collector/output.py	Fri Jun 08 03:36:13 2018 +0000
+++ b/light9/collector/output.py	Fri Jun 08 05:40:02 2018 +0000
@@ -135,6 +135,7 @@
                               scales.IntStat('usbErrors'))
     def __init__(self, uri, bus, numChannels):
         DmxOutput.__init__(self, uri, numChannels)
+        self._shortId = self.uri.rstrip('/')[-1]
         
         from light9.io.udmx import Udmx
         self.dev = Udmx(bus)
@@ -155,7 +156,7 @@
     def update(self, values):
         now = time.time()
         if now > self.lastLog + 1:
-            log.info('udmx %s', ' '.join(map(str, values)))
+            log.info('%s %s', self.shortId(), ' '.join(map(str, values)))
             self.lastLog = now
 
         self.currentBuffer = ''.join(map(chr, values))
@@ -174,5 +175,5 @@
         Udmx.stats.usbErrors += 1
         
     def shortId(self):
-        return 'udmx' # and something unique from self.dev?
+        return self._shortId