Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

renamed irgCom to geocamPycroCom

  • Loading branch information...
commit 82db75a9eac0eed73becd19f3be7a67f21bdaf28 1 parent 663b7fe
@trey0 trey0 authored
View
4 Client.py
@@ -2,8 +2,8 @@
import optparse, sys, code, platform, os
from cStringIO import StringIO
-from irgCom.Dispatcher import Dispatcher
-from irgCom.SharedScheduler import scheduler, ExitSchedulerLoop
+from geocamPycroCom.Dispatcher import Dispatcher
+from geocamPycroCom.SharedScheduler import scheduler, ExitSchedulerLoop
from geocamPycroraptor import commandLineOptions
from geocamPycroraptor.DaemonProxy import DaemonProxy
from geocamPycroraptor import anyjson as json
View
12 Daemon.py
@@ -8,7 +8,7 @@
import errno
import re
-from irgCom.SharedScheduler import scheduler
+from geocamPycroCom.SharedScheduler import scheduler
from geocamPycroraptor.ConfigDict import ConfigDict
from geocamPycroraptor.LocalTask import LocalTask
@@ -439,9 +439,9 @@ def getStatus(self):
else:
return (0, 'pyraptord does not appear to be running -- pid file %s' % pidFileName)
- def irgComConnectHandler(self, sock):
+ def comConnectHandler(self, sock):
if self._opts.logComm:
- print 'connected to client on irgCom endpoint "%s"' % sock.endpoint
+ print 'connected to client on geocamPycroCom endpoint "%s"' % sock.endpoint
self.writeObject(sock, ['name', self._dispatcher._moduleName])
def getStatusUrl(self, taskName):
@@ -563,8 +563,8 @@ def start(self):
else:
print '[there is no startup group]'
- # initialize irgCom
- from irgCom.Dispatcher import Dispatcher
+ # initialize geocamPycroCom
+ from geocamPycroCom.Dispatcher import Dispatcher
moduleName = 'pyraptord-%s-%d' % (self._opts.name, os.getpid())
self._dispatcher = Dispatcher(moduleName=moduleName)
@@ -583,7 +583,7 @@ def start(self):
self._dispatcher.connectToNotificationService(self._opts.notificationService)
for endpoint in self._opts.listenEndpoints:
self._dispatcher.listen(endpoint,
- connectHandler=self.irgComConnectHandler,
+ connectHandler=self.comConnectHandler,
lineHandler=self.commandHandler)
if self._opts.notificationService:
self._dispatcher.findServices(self._opts.notificationService,
View
12 DaemonProxy.py
@@ -1,7 +1,7 @@
import optparse, imp, sys, traceback, socket, os, platform, time
-from irgCom.SharedScheduler import scheduler
-from irgCom.Dispatcher import Dispatcher
+from geocamPycroCom.SharedScheduler import scheduler
+from geocamPycroCom.Dispatcher import Dispatcher
from geocamPycroraptor import commandLineOptions
from geocamPycroraptor.Printable import Printable
from geocamPycroraptor import anyjson as json
@@ -39,7 +39,7 @@ def open(self):
if not self._opened:
if self._opts.notificationService:
self._dispatcher.connectToNotificationService(self._opts.notificationService,
- serviceHandler=self.irgComHandleService)
+ serviceHandler=self.comHandleService)
self._dispatcher.findServices(self._opts.notificationService)
if self._opts.daemons:
self._connectDaemon(self._opts.daemons[0])
@@ -49,17 +49,17 @@ def _connectDaemon(self, endpoint):
if not self._conns.has_key(endpoint):
newConn = (self._dispatcher.connect
(endpoint,
- connectHandler = self.irgComHandleConnect,
+ connectHandler = self.comHandleConnect,
lineHandler = self.handleLine))
self._conns[endpoint] = newConn
if len(self._conns) == 1:
self._currentConn = newConn
- def irgComHandleService(self, finder, serviceName, serviceEvent):
+ def comHandleService(self, finder, serviceName, serviceEvent):
if serviceName.startswith('pyraptord'):
self._connectDaemon(serviceEvent)
- def irgComHandleConnect(self, sock):
+ def comHandleConnect(self, sock):
# asyncore should set connected flag earlier -- avoid infinite loop
sock.connected = True
if self._connectHandler:
View
2  LocalTask.py
@@ -9,7 +9,7 @@
import shlex
import errno
-from irgCom.SharedScheduler import scheduler
+from geocamPycroCom.SharedScheduler import scheduler
from geocamPycroraptor.ExpandVariables import expandVal
from geocamPycroraptor import Log
View
2  SubscriberSet.py
@@ -1,5 +1,5 @@
-from irgCom.WeakSet import WeakSet
+from geocamPycroCom.WeakSet import WeakSet
from geocamPycroraptor.PycroEncoder import PycroEncoder
from geocamPycroraptor.printTraceback import printTraceback
Please sign in to comment.
Something went wrong with that request. Please try again.