Skip to content

Commit bf028d1

Browse files
committed
Adding additional logging to startup, to determine why Travis is hanging hopefully
1 parent ec3f7b1 commit bf028d1

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/classes/app.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,14 @@ def __init__(self, *args, mode=None):
7676
reroute_output()
7777
except ImportError as ex:
7878
tb = traceback.format_exc()
79+
log.error('OpenShotApp::Import Error: %s' % str(ex))
7980
QMessageBox.warning(None, "Import Error",
8081
"Module: %(name)s\n\n%(tb)s" % {"name": ex.name, "tb": tb})
8182
# Stop launching and exit
8283
raise
8384
sys.exit()
84-
except Exception:
85-
raise
85+
except Exception as ex:
86+
log.error('OpenShotApp::Init Error: %s' % str(ex))
8687
sys.exit()
8788

8889
# Log some basic system info

src/windows/main_window.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ def closeEvent(self, event):
159159
# Close & Stop libopenshot logger
160160
openshot.ZmqLogger.Instance().Close()
161161
app.logger_libopenshot.kill()
162-
self.http_server_thread.kill()
162+
if self.http_server_thread:
163+
self.http_server_thread.kill()
163164

164165
# Destroy lock file
165166
self.destroy_lock_file()
@@ -2448,11 +2449,6 @@ def transformTriggered(self, clip_id):
24482449
else:
24492450
self.is_transforming = False
24502451

2451-
def init_thumbnail_server(self):
2452-
"""Initialize and start the thumbnail HTTP server"""
2453-
self.http_server_thread = httpThumbnailServerThread()
2454-
self.http_server_thread.start()
2455-
24562452
def __init__(self, mode=None):
24572453

24582454
# Create main window base class
@@ -2510,8 +2506,11 @@ def __init__(self, mode=None):
25102506
if not self.mode == "unittest":
25112507
self.RecoverBackup.connect(self.recover_backup)
25122508

2513-
# Init HTTP server for thumbnails
2514-
self.init_thumbnail_server()
2509+
# Initialize and start the thumbnail HTTP server
2510+
self.http_server_thread = httpThumbnailServerThread()
2511+
self.http_server_thread.start()
2512+
else:
2513+
self.http_server_thread = None
25152514

25162515
# Create the timeline sync object (used for previewing timeline)
25172516
self.timeline_sync = TimelineSync(self)
@@ -2666,6 +2665,8 @@ def __init__(self, mode=None):
26662665
# Show window
26672666
if not self.mode == "unittest":
26682667
self.show()
2668+
else:
2669+
log.info('Hiding UI for unittests')
26692670

26702671
# Create tutorial manager
26712672
self.tutorial_manager = TutorialManager(self)

0 commit comments

Comments
 (0)