equal
deleted
inserted
replaced
73 print(str(err)) # will print something like "option -a not recognized" |
73 print(str(err)) # will print something like "option -a not recognized" |
74 usage() |
74 usage() |
75 sys.exit(2) |
75 sys.exit(2) |
76 |
76 |
77 # default values |
77 # default values |
78 given_ip = None |
78 interface = '' |
79 port = 3000 |
79 port = 3000 |
80 webport = 8009 |
80 webport = 8009 |
81 wampsecret = None |
81 wampsecret = None |
82 wampconf = None |
82 wampconf = None |
83 servicename = None |
83 servicename = None |
95 sys.exit() |
95 sys.exit() |
96 if o == "--version": |
96 if o == "--version": |
97 version() |
97 version() |
98 sys.exit() |
98 sys.exit() |
99 elif o == "-i": |
99 elif o == "-i": |
100 if len(a.split(".")) == 4 or a == "localhost": |
100 if len(a.split(".")) == 4: |
101 given_ip = a |
101 interface = a |
|
102 elif a == "localhost": |
|
103 interface = '127.0.0.1' |
102 else: |
104 else: |
103 usage() |
105 usage() |
104 sys.exit() |
106 sys.exit() |
105 elif o == "-p": |
107 elif o == "-p": |
106 # port: port that the service runs on |
108 # port: port that the service runs on |
489 |
491 |
490 |
492 |
491 runtime.CreatePLCObjectSingleton( |
493 runtime.CreatePLCObjectSingleton( |
492 WorkingDir, argv, statuschange, evaluator, pyruntimevars) |
494 WorkingDir, argv, statuschange, evaluator, pyruntimevars) |
493 |
495 |
494 pyroserver = Server(servicename, given_ip, port) |
496 pyroserver = Server(servicename, interface, port) |
495 |
497 |
496 if havewx: |
498 if havewx: |
497 taskbar_instance = BeremizTaskBarIcon(pyroserver) |
499 taskbar_instance = BeremizTaskBarIcon(pyroserver) |
498 |
500 |
499 if havetwisted: |
501 if havetwisted: |
500 if webport is not None: |
502 if webport is not None: |
501 try: |
503 try: |
502 website = NS.RegisterWebsite(webport) |
504 website = NS.RegisterWebsite(interface, webport) |
503 pyruntimevars["website"] = website |
505 pyruntimevars["website"] = website |
504 NS.SetServer(pyroserver) |
506 NS.SetServer(pyroserver) |
505 statuschange.append(NS.website_statuslistener_factory(website)) |
507 statuschange.append(NS.website_statuslistener_factory(website)) |
506 except Exception: |
508 except Exception: |
507 LogMessageAndException(_("Nevow Web service failed. ")) |
509 LogMessageAndException(_("Nevow Web service failed. ")) |