Mercurial > code > home > repos > homeauto
changeset 806:85e50a597244
entrancemusic improve logging
Ignore-this: eef92829644417e97f11065e11af0265
darcs-hash:20110806224909-312f9-870930db224a59ffca846fbfd2fe7af52b2e2b89.gz
author | drewp <drewp@bigasterisk.com> |
---|---|
date | Sat, 06 Aug 2011 15:49:09 -0700 |
parents | 9e99114dde57 |
children | 4713bb87e34e |
files | lib/logsetup.py service/tomatoWifi/tomatoWifi.py |
diffstat | 2 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/logsetup.py Sat Aug 06 15:49:09 2011 -0700 @@ -0,0 +1,7 @@ +# todo: graylog, twisted web route to some channel + +import logging +logging.basicConfig(format="%(created)f %(asctime)s %(name)s %(levelname)s %(message)s") +logging.getLogger('restkit.client').setLevel(logging.WARN) +log = logging.getLogger() +log.setLevel(logging.INFO)
--- a/service/tomatoWifi/tomatoWifi.py Mon Aug 01 03:30:30 2011 -0700 +++ b/service/tomatoWifi/tomatoWifi.py Sat Aug 06 15:49:09 2011 -0700 @@ -13,7 +13,6 @@ from __future__ import division import sys, cyclone.web, simplejson, traceback, time, pystache, datetime from dateutil import tz -from twisted.python import log from twisted.internet import reactor, task from pymongo import Connection, DESCENDING @@ -24,10 +23,12 @@ sys.path.append("/my/proj/homeauto/lib") from cycloneerr import PrettyErrorHandler +from logsetup import log DEV = Namespace("http://projects.bigasterisk.com/device/") ROOM = Namespace("http://projects.bigasterisk.com/room/") + class Index(PrettyErrorHandler, cyclone.web.RequestHandler): def get(self): @@ -127,19 +128,19 @@ actions = self.computeActions(newWithSignal) for action in actions: + log.info("action: %s", action) action['created'] = datetime.datetime.now(tz.gettz('UTC')) mongo.save(action) try: self.doEntranceMusic(action) except Exception, e: - print "entrancemusic error", e + log.error("entrancemusic error: %r", e) self.lastWithSignal = newWithSignal self.lastAddrs = newAddrs self.lastPollTime = time.time() except Exception, e: - print "poll error", e - traceback.print_exc() + log.error("poll error: %s\n%s", e, traceback.format_exc()) def computeActions(self, newWithSignal): def removeVolatile(a): @@ -174,17 +175,20 @@ return actions + # these need to move out to their own service def doEntranceMusic(self, action): - # these need to move out to their own service + import restkit, jsonlib dt = self.deltaSinceLastArrive(action['name']) + log.debug("dt=%s", dt) if dt > datetime.timedelta(hours=1): - import restkit, jsonlib hub = restkit.Resource( # PSHB not working yet; "http://bang:9030/" "http://slash:9049/" ) action = action.copy() del action['created'] + del action['_id'] + log.info("post to %s", hub) hub.post("visitorNet", payload=jsonlib.dumps(action)) def deltaSinceLastArrive(self, name): @@ -202,8 +206,9 @@ 'servePort' : 9070, 'pollFrequency' : 1/5, } + from twisted.python import log as twlog #log.startLogging(sys.stdout) - + #log.setLevel(10) mongo = Connection('bang', 27017)['visitor']['visitor']