[Erp5-report] r8021 - /spec/mandriva/2006.0/zope-TimerService/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jun 19 17:40:48 CEST 2006
Author: kevin
Date: Mon Jun 19 17:40:44 2006
New Revision: 8021
URL: http://svn.erp5.org?rev=8021&view=rev
Log:
Commit zope-TimerService-0.2-3mdk spec files and patches
Modified:
spec/mandriva/2006.0/zope-TimerService/TimerService-erp5.patch
spec/mandriva/2006.0/zope-TimerService/zope-TimerService.spec
Modified: spec/mandriva/2006.0/zope-TimerService/TimerService-erp5.patch
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-TimerService/TimerService-erp5.patch?rev=8021&r1=8020&r2=8021&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-TimerService/TimerService-erp5.patch (original)
+++ spec/mandriva/2006.0/zope-TimerService/TimerService-erp5.patch Mon Jun 19 17:40:44 2006
@@ -1,9 +1,8 @@
-diff -ur TimerService/timerserver/TimerServer.py TimerService-0.2/timerserver/TimerServer.py
---- TimerService/timerserver/TimerServer.py 2004-03-17 11:59:42.000000000 +0100
-+++ TimerService-0.2/timerserver/TimerServer.py 2005-10-31 11:13:54.733011411 +0100
+--- TimerService-0.2/TimerService/timerserver/TimerServer.py 2004-03-17 11:59:42.000000000 +0100
++++ TimerService-0.2.patched/TimerService/timerserver/TimerServer.py 2005-10-31 11:13:54.733011411 +0100
@@ -6,7 +6,10 @@
import traceback
-
+
import thread
-import sys, os, errno, time
+
@@ -12,27 +11,27 @@
+import ZPublisher.Client
from StringIO import StringIO
from zLOG import LOG, INFO
-
+
@@ -14,9 +17,10 @@
from ZPublisher.BaseRequest import BaseRequest
from ZPublisher.BaseResponse import BaseResponse
from ZPublisher.HTTPRequest import HTTPRequest
+from ZPublisher import Client
-
+
class TimerServer:
- def __init__(self, module, interval=600):
+ def __init__(self, module, interval=5):
self.module = module
-
+
self.interval = interval
@@ -35,6 +39,34 @@
'\tInterval: %s seconds.\n'%(time.ctime(time.time()), interval))
-
+
def run(self):
-+
++
+ # wait until the zhttp_server exist in socket_map
+ # because TimerService has to be started after the Zope HTTPServer
-+ from asyncore import socket_map
++ from asyncore import socket_map
+ while 1:
+ time.sleep(5)
+ for k, v in socket_map.items():
@@ -44,9 +43,9 @@
+ break
+ if port:
+ break
-+
++
+ ip = socket.gethostbyname(socket.gethostname())
-+
++
+ # To be very sure, try to connect to the HTTPServer
+ # and only start after we are able to connect
+ while 1:
@@ -56,25 +55,24 @@
+ except ValueError:
+ continue
+ break
-+
++
module = self.module
interval = self.interval
-
-diff -ur TimerService/TimerService.py TimerService-0.2/TimerService.py
---- TimerService/TimerService.py 2004-03-17 12:22:52.000000000 +0100
-+++ TimerService-0.2/TimerService.py 2005-10-31 11:40:01.328681204 +0100
+
+--- TimerService-0.2/TimerService/TimerService.py 2004-03-17 12:22:52.000000000 +0100
++++ TimerService-0.2.patched/TimerService/TimerService.py 2005-10-31 11:40:01.328681204 +0100
@@ -53,15 +53,16 @@
for path in self._subscribers]
-
+
tick = time.time()
- prev_tick = tick - interval
- next_tick = tick + interval
+# prev_tick = tick - interval
+# next_tick = tick + interval
-
+
- LOG('TimerService', INFO, 'Ttimer tick at %s\n'%time.ctime(tick))
+# LOG('TimerService', INFO, 'Ttimer tick at %s\n'%time.ctime(tick))
-
+
for subscriber in subscriptions:
try:
- subscriber.process_timer(
@@ -84,35 +82,35 @@
+ subscriber.process_timer(tick, interval)
except:
LOG('TimerService', ERROR, 'Process timer error', error = sys.exc_info())
-
+
@@ -76,6 +77,12 @@
if path not in subscribers:
subscribers.append(path)
self._subscribers = subscribers
-+
++
+ def unsubscribeByPath(self, path):
+ subscribers = self._subscribers
+ if path in subscribers:
+ subscribers.remove(path)
+ self._subscribers = subscribers
-
+
def unsubscribe(self, ob):
""" """
@@ -94,12 +101,14 @@
-
+
def manage_removeSubscriptions(self, no, REQUEST=None):
""" """
- subs = self.listAllSubscriptions()
+ subs = self.lisSubscriptions()
-+
++
+ #LOG('asdd',INFO,subs)
-
+
remove_list = [subs[n] for n in [int(n) for n in no]]
-
+
- for subs, event, fl in remove_list:
- self.unsubscribe( subs, event_type=event )
+ for sub in remove_list:
+ self.unsubscribeByPath(sub)
-
+
if REQUEST is not None:
REQUEST.RESPONSE.redirect('manage_viewSubscriptions')
Modified: spec/mandriva/2006.0/zope-TimerService/zope-TimerService.spec
URL: http://svn.erp5.org/spec/mandriva/2006.0/zope-TimerService/zope-TimerService.spec?rev=8021&r1=8020&r2=8021&view=diff
==============================================================================
--- spec/mandriva/2006.0/zope-TimerService/zope-TimerService.spec (original)
+++ spec/mandriva/2006.0/zope-TimerService/zope-TimerService.spec Mon Jun 19 17:40:44 2006
@@ -1,6 +1,6 @@
%define product TimerService
%define version 0.2
-%define release 2
+%define release 3
%define zope_home %{_prefix}/lib/zope
%define software_home %{zope_home}/lib/python
@@ -19,7 +19,6 @@
BuildArch: noarch
Requires: zope
-
#----------------------------------------------------------------------
%description
TimerService provides to Zope objects the ability to subsribe
@@ -31,7 +30,7 @@
#----------------------------------------------------------------------
%prep
%setup -c
-#%patch1 -p1
+%patch1 -p1
%build
#cd %{product}/timerserver
@@ -76,6 +75,9 @@
#----------------------------------------------------------------------
%changelog
+* Mon Jan 30 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-3mdk
+- Apply Klaus' patch: it seems it make zope starting in a better way
+
* Mon Jan 23 2006 Kevin Deldycke <kevin at nexedi.com> 0.2-2mdk
- Update the description
- Set the default interval to 5 seconds
More information about the Erp5-report
mailing list