From c5f8afebb23e1e0a7eb1e6ba59af10ee0bc033b4 Mon Sep 17 00:00:00 2001 From: computergeek125 Date: Sun, 21 Mar 2021 23:35:17 -0500 Subject: [PATCH] whoops forgot to merge something --- main.py | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/main.py b/main.py index 27dac695..e2e352c3 100644 --- a/main.py +++ b/main.py @@ -101,36 +101,20 @@ if __name__ == '__main__': console.debug("Existing install detected") 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 controller = Controller() tasks_manager = TasksManager(controller) ->>>>>>> backups-and-stuff tasks_manager.start_webserver() # slowing down reporting just for a 1/2 second so messages look cleaner time.sleep(.5) -<<<<<<< HEAD -======= # init servers logger.info("Initializing all servers defined") console.info("Initializing all servers defined") controller.init_all_servers() servers = controller.list_defined_servers() ->>>>>>> backups-and-stuff # start stats logging tasks_manager.start_stats_recording() @@ -144,7 +128,6 @@ if __name__ == '__main__': tasks_manager.start_main_kill_switch_watcher() Crafty = MainPrompt(tasks_manager) -<<<<<<< HEAD if not args.daemon: Crafty.cmdloop() else: @@ -165,12 +148,3 @@ if __name__ == '__main__': if tasks_manager.get_main_thread_run_status(): sys.exit(0) 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