Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

whoops forgot to merge something

Browse Source
This commit is contained in:
computergeek125 2021-03-21 23:35:17 -05:00
parent 506c9bb3c3
commit c5f8afebb2
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.py
View File

@ -101,36 +101,20 @@ if __name__ == '__main__':
console.debug("Existing install detected") console.debug("Existing install detected")
installer.check_schema_version() installer.check_schema_version()
<<<<<<< HEAD
# init servers
logger.info("Initializing all servers defined")
console.info("Initializing all servers defined")
controller.init_all_servers()
servers = controller.list_defined_servers()
# now the tables are created, we can load the tasks_manger
tasks_manager = TasksManager()
=======
# now the tables are created, we can load the tasks_manger and server controller # now the tables are created, we can load the tasks_manger and server controller
controller = Controller() controller = Controller()
tasks_manager = TasksManager(controller) tasks_manager = TasksManager(controller)
>>>>>>> backups-and-stuff
tasks_manager.start_webserver() tasks_manager.start_webserver()
# slowing down reporting just for a 1/2 second so messages look cleaner # slowing down reporting just for a 1/2 second so messages look cleaner
time.sleep(.5) time.sleep(.5)
<<<<<<< HEAD
=======
# init servers # init servers
logger.info("Initializing all servers defined") logger.info("Initializing all servers defined")
console.info("Initializing all servers defined") console.info("Initializing all servers defined")
controller.init_all_servers() controller.init_all_servers()
servers = controller.list_defined_servers() servers = controller.list_defined_servers()
>>>>>>> backups-and-stuff
# start stats logging # start stats logging
tasks_manager.start_stats_recording() tasks_manager.start_stats_recording()
@ -144,7 +128,6 @@ if __name__ == '__main__':
tasks_manager.start_main_kill_switch_watcher() tasks_manager.start_main_kill_switch_watcher()
Crafty = MainPrompt(tasks_manager) Crafty = MainPrompt(tasks_manager)
<<<<<<< HEAD
if not args.daemon: if not args.daemon:
Crafty.cmdloop() Crafty.cmdloop()
else: else:
@ -165,12 +148,3 @@ if __name__ == '__main__':
if tasks_manager.get_main_thread_run_status(): if tasks_manager.get_main_thread_run_status():
sys.exit(0) sys.exit(0)
time.sleep(1) time.sleep(1)
=======
Crafty.cmdloop()
# our main loop - eventually a shell
# while True:
# if tasks_manager.get_main_thread_run_status():
# sys.exit(0)
# time.sleep(1)
>>>>>>> backups-and-stuff