Jukebox/jukebox-software
10
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 2 Wiki Activity

Make firefox start faster, verbose start

Browse Source
This commit is contained in:
Cole Deck 2024-01-18 16:41:57 -06:00
parent 2a9a6c1576
commit 13b1c87b94
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
run.py
View File

@ -112,7 +112,7 @@ def setup_server(pool):
global arm_ready global arm_ready
global serverproc global serverproc
fprint("Starting Jukebox control system...")
pool.apply_async(ur5_control.init, (config["arm"]["ip"],), callback=arm_start_callback) pool.apply_async(ur5_control.init, (config["arm"]["ip"],), callback=arm_start_callback)
#pool.apply_async(led_control.init, callback=led_start_callback) #pool.apply_async(led_control.init, callback=led_start_callback)
#pool.apply_async(camera_control.init, callback=camera_start_callback) #pool.apply_async(camera_control.init, callback=camera_start_callback)
@ -169,6 +169,8 @@ def run_loading_app():
def setup_client(pool): def setup_client(pool):
# Windows client setup # Windows client setup
firefox = webdriver.Firefox()
firefox.fullscreen_window()
global config global config
global vm_ready global vm_ready
global serverproc global serverproc
@ -176,8 +178,7 @@ def setup_client(pool):
p = Process(target=run_loading_app) p = Process(target=run_loading_app)
p.start() p.start()
firefox = webdriver.Firefox()
firefox.fullscreen_window()
firefox.get('http://localhost:7000') firefox.get('http://localhost:7000')
# start Linux server VM # start Linux server VM
@ -198,7 +199,7 @@ def setup_client(pool):
while vm_ready is False: while vm_ready is False:
sleep(0.1) sleep(0.1)
p.terminate() p.terminate()
firefox.get("http://" + config["core"]["serverip"] + ":5000") firefox.get("http://" + config["core"]["serverip"] + ":8000")
return True return True
@ -270,17 +271,19 @@ if __name__ == "__main__":
#sys.stdout = Logger(filename="output.log") #sys.stdout = Logger(filename="output.log")
#sys.stderr = Logger(filename="output.log") #sys.stderr = Logger(filename="output.log")
#log_to_stderr(logging.DEBUG) #log_to_stderr(logging.DEBUG)
fprint("Starting Jukebox control system...")
with open('config.yml', 'r') as fileread: with open('config.yml', 'r') as fileread:
#global config #global config
config = yaml.safe_load(fileread) config = yaml.safe_load(fileread)
with Manager() as manager: with Manager() as manager:
fprint("Spawning threads...")
pool = LoggingPool(processes=10) pool = LoggingPool(processes=10)
counter = 0 counter = 0
killme = manager.Value('d', 0) killme = manager.Value('d', 0)
signal.signal(signal.SIGINT, killall_signal) signal.signal(signal.SIGINT, killall_signal)
if config["core"]["mode"] == "winclient": if config["core"]["mode"] == "winclient":
fprint("Starting in client mode.")
from selenium import webdriver from selenium import webdriver
if setup_client(pool): if setup_client(pool):
fprint("Entering main loop...") fprint("Entering main loop...")
@ -288,6 +291,7 @@ if __name__ == "__main__":
mainloop_client(pool) mainloop_client(pool)
elif config["core"]["mode"] == "linuxserver": elif config["core"]["mode"] == "linuxserver":
fprint("Starting in server mode.")
if setup_server(pool): if setup_server(pool):
fprint("Entering main loop...") fprint("Entering main loop...")
while(keeprunning): while(keeprunning):