Skip to content

Commit

Permalink
dont initialize server listening in main init of worker class
Browse files Browse the repository at this point in the history
- moved socket listening to sub method from init() and initialize when required for the first time (testing build & deploy)
  • Loading branch information
amitabhverma committed Jan 8, 2025
1 parent 78a0524 commit 93bfa87
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 10 deletions.
2 changes: 1 addition & 1 deletion recOrder/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ def cli():
cli.add_command(apply_inv_tf)
cli.add_command(gui)

if __name__ == '__main__':
if __name__ == "__main__":
cli()
27 changes: 18 additions & 9 deletions recOrder/plugin/tab_recon.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,15 +370,16 @@ def __init__(self, parent=None, stand_alone=False):
HAS_INSTANCE["val"] = True
HAS_INSTANCE["MyWorker"] = self.worker

app = QApplication.instance()
app.lastWindowClosed.connect(
self.app = QApplication.instance()
self.app.lastWindowClosed.connect(
self.myCloseEvent
) # this line is connection to signal close

# our defined close event since napari doesnt do
def myCloseEvent(self):
event = QEvent(QEvent.Type.Close)
self.closeEvent(event)
# self.app.exit()

# on napari close - cleanup
def closeEvent(self, event):
Expand Down Expand Up @@ -2323,15 +2324,20 @@ def __init__(self, formLayout, tab_recon: Ui_ReconTab_Form, parentForm):
# self.runner = CliRunner()
# jobs_mgmt.shared_var_jobs = self.JobsManager.shared_var_jobs
self.JobsMgmt = jobs_mgmt.JobsManagement()
self.JobsMgmt.clearLogs()
self.useServer = True
self.serverRunning = True
self.server_socket = None
thread = threading.Thread(target=self.startServer)
thread.start()
self.workerThreadRowDeletion = RowDeletionWorkerThread(self.formLayout)
self.workerThreadRowDeletion.removeRowSignal.connect(self.tab_recon.removeRow)
self.workerThreadRowDeletion.start()
self.server_socket = None
self.isInitialized = False

def initialize(self):
if not self.isInitialized:
thread = threading.Thread(target=self.startServer)
thread.start()
self.workerThreadRowDeletion = RowDeletionWorkerThread(self.formLayout)
self.workerThreadRowDeletion.removeRowSignal.connect(self.tab_recon.removeRow)
self.workerThreadRowDeletion.start()
self.JobsMgmt.clearLogs()
self.isInitialized = True

def setNewInstances(self, formLayout, tab_recon, parentForm):
self.formLayout: QFormLayout = formLayout
Expand Down Expand Up @@ -2779,6 +2785,9 @@ def clientRelease(self, expIdx, jobIdx, client_socket, params):
self.pool = None

def runInPool(self, params):
if not self.isInitialized:
self.initialize()

self.startPool()
self.results[params["exp_id"]] = {}
self.results[params["exp_id"]]["JobUNK"] = params
Expand Down

0 comments on commit 93bfa87

Please sign in to comment.