beremiz: comparison Beremiz

equal deleted inserted replaced

-:2250ed42e306
+:780bd150ebba
 import os, sys, getopt
 def usage():
 print """
 Usage of Beremiz PLC execution service :\n
-%s {[-n name] [-i ip] [-p port] [-x enabletaskbar] [-a autostart]|-h|--help} working_dir
+%s {[-n servicename] [-i ip] [-p port] [-x enabletaskbar] [-a autostart]|-h|--help} working_dir
--n        - zeroconf service name
+-n        - zeroconf service name (default:disabled)
--i        - ip of interface to bind to (x.x.x.x)
+-i        - ip of interface to bind to (default:localhost)
--p        - port number
+-p        - port number default:3000
 -h        - print this help text and quit
--a        - autostart PLC (0:disable 1:enable)
+-a        - autostart PLC (0:disable 1:enable) (default:0)
--x        - enable/disable wxTaskbarIcon (0:disable 1:enable)
+-x        - enable/disable wxTaskbarIcon (0:disable 1:enable) (default:1)
--t        - enable/disable Twisted web interface (0:disable 1:enable)
+-t        - enable/disable Twisted web interface (0:disable 1:enable) (default:1)
 working_dir - directory where are stored PLC files
 """%sys.argv[0]
 try:
 sys.exit(2)
 # default values
 ip = ""
 port = 3000
-name = os.environ[{
+servicename = None
-"linux2":"USER",
-"win32":"USERNAME",
-}.get(sys.platform, "USER")]
 autostart = False
 enablewx = True
 havewx = False
 enabletwisted = True
 havetwisted = False
 ip = a
 elif o == "-p":
 # port: port that the service runs on
 port = int(a)
 elif o == "-n":
-name = a
+servicename = a
 elif o == "-x":
 enablewx = int(a)
 elif o == "-t":
 enabletwisted = int(a)
 elif o == "-a":
 import wx, re
 from threading import Thread, currentThread
 from types import *
 havewx = True
 except:
+print "Wx unavailable !"
 havewx = False
 if havewx:
 app=wx.App(redirect=False)
 def default_evaluator(callable, *args, **kwargs):
 return callable(*args,**kwargs)
 class Server():
-def __init__(self, name, ip, port, workdir, argv, autostart=False, statuschange=None, evaluator=default_evaluator, website=None):
+def __init__(self, servicename, ip, port, workdir, argv, autostart=False, statuschange=None, evaluator=default_evaluator, website=None):
 self.continueloop = True
 self.daemon = None
-self.name = name
+self.servicename = servicename
 self.ip = ip
 self.port = port
 self.workdir = workdir
 self.argv = argv
 self.plcobj = None
 pyro.initServer()
 self.daemon=pyro.Daemon(host=self.ip, port=self.port)
 self.plcobj = PLCObject(self.workdir, self.daemon, self.argv, self.statuschange, self.evaluator, self.website)
 uri = self.daemon.connect(self.plcobj,"PLCObject")
-print "The daemon runs on port :",self.port
+print "Pyro port :",self.port
-print "The object's uri is :",uri
+print "Pyro object's uri :",uri
-print "The working directory :",self.workdir
+print "Current working directory :",self.workdir
 # Configure and publish service
 # Not publish service if localhost in address params
-if self.ip != "localhost" and self.ip != "127.0.0.1":
+if self.servicename is not None and self.ip != "localhost" and self.ip != "127.0.0.1":
-print "Publish service on local network"
+print "Publishing service on local network"
 self.servicepublisher = ServicePublisher.ServicePublisher()
-self.servicepublisher.RegisterService(self.name, self.ip, self.port)
+self.servicepublisher.RegisterService(self.servicename, self.ip, self.port)
 if self.autostart:
 self.plcobj.StartPLC()
 sys.stdout.flush()
 def Stop(self):
 self.plcobj.StopPLC()
 if self.servicepublisher is not None:
 self.servicepublisher.UnRegisterService()
-del self.servicepublisher
+self.servicepublisher = None
 self.daemon.shutdown(True)
 if enabletwisted:
 try:
+from threading import Thread, currentThread
 if havewx:
 from twisted.internet import wxreactor
 wxreactor.install()
 from twisted.internet import reactor, task
 from twisted.python import log, util
 from nevow import rend, appserver, inevow, tags, loaders, athena
 from nevow.page import renderer
 havetwisted = True
 except:
+print "Twisted unavailable !"
 havetwisted = False
 if havetwisted:
 xhtml_header = '''<?xml version="1.0" encoding="utf-8"?>
 #print reason
 #print "We will be called back when the client disconnects"
 if havewx:
 reactor.registerWxApp(app)
-res = WebInterface()
+website = WebInterface()
-site = appserver.NevowSite(res)
+site = appserver.NevowSite(website)
 website_port = 8009
 listening = False
 while not listening:
 try:
 reactor.listenTCP(website_port, site)
 listening = True
 except:
 website_port += 1
+print "Http interface port :",website_port
 else:
-res = None
+website = None
 if havewx:
 from threading import Semaphore
 wx_eval_lock = Semaphore(0)
 mythread = currentThread()
 callable(*args,**kwargs)
 else:
 wx.CallAfter(wx_evaluator,callable,*args,**kwargs)
 wx_eval_lock.acquire()
 return eval_res
-pyroserver = Server(name, ip, port, WorkingDir, argv, autostart, statuschange, evaluator, res)
+pyroserver = Server(servicename, ip, port, WorkingDir, argv, autostart, statuschange, evaluator, website)
 taskbar_instance = BeremizTaskBarIcon(pyroserver)
+else:
+pyroserver = Server(servicename, ip, port, WorkingDir, argv, autostart, website=website)
+if havetwisted or havewx:
 pyro_thread=Thread(target=pyroserver.Loop)
 pyro_thread.start()
+if havetwisted:
+reactor.run()
+elif havewx:
+app.MainLoop()
 else:
-pyroserver = Server(name, ip, port, WorkingDir, argv, autostart, website=res)
+try :
+pyroserver.Loop()
-if havetwisted:
+except KeyboardInterrupt,e:
-reactor.run()
+pass
-elif havewx:
+pyroserver.Quit()
-app.MainLoop()
+sys.exit(0)
-else:
-pyroserver.Loop()

changeset 606	780bd150ebba
parent 446	1edde533db19
child 612	f44651506a88