[CalendarServer-changes] [12668] CalendarServer/trunk/calendarserver/webadmin/logs.py

[source_changes at macosforge.org]

Revision: 12668
          http://trac.calendarserver.org//changeset/12668
Author:   wsanchez at apple.com
Date:     2014-02-11 21:55:02 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Get rid of attemps at not polling

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/logs.py

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-12 03:25:08 UTC (rev 12667)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-12 05:55:02 UTC (rev 12668)
@@ -31,7 +31,7 @@
 from zope.interface import implementer
 
 from twisted.python.log import FileLogObserver
-from twisted.internet.defer import Deferred, succeed
+from twisted.internet.defer import succeed
 
 from txweb2.stream import IByteStream, fallbackSplit
 from txweb2.resource import Resource
@@ -75,7 +75,6 @@
 
 
     def render(self, request):
-        self.element = LogsPageElement()
         return TemplateResource.render(self, request)
 
 
@@ -139,10 +138,7 @@
         self._start = start
         self._closed = False
 
-        from twisted.internet import reactor
-        self._reactor = reactor
 
-
     def read(self):
         if self._closed:
             return None
@@ -191,18 +187,12 @@
 
         return succeed(None)
 
-        # def readAgain(_):
-        #     return self.read()
+        # from twisted.internet.task import deferLater
+        # from twisted.internet import reactor
 
-        # d = Deferred()
-        # d.addCallback(readAgain)
+        # return deferLater(reactor, 1.0, self.read)
 
-        # for observer in self._source.observers:
-        #     observer.registerDeferred(d)
 
-        # return d
-
-
     def split(self, point):
         return fallbackSplit(self, point)
 
@@ -224,8 +214,6 @@
 
 
     def __init__(self, buffer):
-        self._junk = file("/tmp/junk", "a")
-
         class FooIO(object):
             def write(_, s):
                 self._lastMessage = s
@@ -243,16 +231,9 @@
     def emit(self, event):
         self._buffer.append((self, u"server", event))
 
-        self._junk.write("emit: {0!r} on {1}\n".format(self._waiting, self))
-        self._junk.flush()
-
         while self._waiting:
             d = self._waiting.pop(0)
-            self._junk.write("calling: {0}\n".format(d))
-            self._junk.flush()
             d.callback(None)
-            self._junk.write("called: {0}\n".format(d))
-            self._junk.flush()
 
 
     def formatEvent(self, event):
@@ -261,13 +242,7 @@
         return self._lastMessage
 
 
-    def registerDeferred(self, d):
-        self._waiting.append(d)
-        self._junk.write("Registered: {0} on {1}\n".format(self._waiting, self))
-        self._junk.flush()
 
-
-
 class AccessLogObserver(CommonAccessLoggingObserverExtensions):
     """
     Log observer that captures apache-style access log text entries in a
@@ -291,11 +266,7 @@
         self._buffer.append((self, u"access", event))
 
 
-    def registerDeferred(self, d):
-        pass
 
-
-
 def textAsEvent(text, eventID=None, eventClass=None):
     event = []
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/964cdc04/attachment.html>