File tree Expand file tree Collapse file tree 4 files changed +14
-3
lines changed Expand file tree Collapse file tree 4 files changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -623,11 +623,12 @@ def _get_unique_containers(instrument):
623
623
"""
624
624
unique_containers = set ()
625
625
for location in instrument .placeables :
626
- if isinstance (location , containers .placeable .WellSeries ):
626
+ while isinstance (location , containers .placeable .WellSeries ):
627
627
location = location [0 ]
628
628
for c in location .get_trace ():
629
629
if isinstance (c , containers .placeable .Container ):
630
630
unique_containers .add (c )
631
+ break
631
632
632
633
return _sort_containers (list (unique_containers ))
633
634
Original file line number Diff line number Diff line change @@ -32,7 +32,6 @@ function createWindow (windowUrl) {
32
32
width : 1060 ,
33
33
height : 750
34
34
} )
35
- mainWindow . loadURL ( windowUrl , { "extraHeaders" : "pragma: no-cache\n" } )
36
35
mainWindow . on ( 'closed' , function ( ) {
37
36
mainLogger . info ( 'Electron App window closed, quitting App' )
38
37
rp ( windowUrl + 'exit' )
@@ -41,17 +40,26 @@ function createWindow (windowUrl) {
41
40
app . quit ( )
42
41
} )
43
42
. catch ( ( err ) => {
43
+ mainLogger . info ( 'Received an expected error while calling exit route' )
44
44
mainLogger . info ( err )
45
45
mainWindow = null
46
46
app . quit ( )
47
47
} )
48
48
} )
49
+ mainWindow . on ( 'unresponsive' , function ( ) {
50
+ mainLogger . info ( 'window is unresponsive, reloading' )
51
+ setTimeout ( mainWindow . reload , 500 )
52
+ } )
49
53
// Note: Auth0 pop window does not close itself, this will this window when it pops up
50
54
setInterval ( ( ) => {
51
55
BrowserWindow . getAllWindows ( )
52
56
. filter ( win => win . frameName === 'auth0_signup_popup' )
53
57
. map ( win => win . close ( ) )
54
58
} , 3000 )
59
+ // load the UI (no caching)
60
+ setTimeout ( ( ) => {
61
+ mainWindow . loadURL ( windowUrl , { "extraHeaders" : "pragma: no-cache\n" } )
62
+ } , 200 )
55
63
return mainWindow
56
64
}
57
65
@@ -81,6 +89,7 @@ function startUp () {
81
89
process . on ( 'uncaughtException' , ( error ) => {
82
90
if ( process . listeners ( 'uncaughtException' ) . length > 1 ) {
83
91
console . log ( error )
92
+ mainLogger . info ( 'Uncaught Exception:' )
84
93
mainLogger . info ( error )
85
94
}
86
95
} )
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ var UPDATE_SERVER_URL = 'http://ot-app-releases-2.herokuapp.com'
7
7
8
8
function initAutoUpdater ( ) {
9
9
const mainLogger = getLogger ( 'electron-main' )
10
- mainLogger . info ( 'starting ' )
10
+ mainLogger . info ( 'Initializing Audo Updater ' )
11
11
12
12
autoUpdater . on (
13
13
'error' ,
Original file line number Diff line number Diff line change @@ -9,6 +9,7 @@ function waitUntilServerResponds (createWindow, windowUrl) {
9
9
return createWindow ( )
10
10
} )
11
11
. catch ( ( err ) => {
12
+ mainLogger . info ( 'Error while pinging ' + windowUrl )
12
13
mainLogger . info ( err )
13
14
setTimeout ( ( ) => {
14
15
waitUntilServerResponds ( createWindow , windowUrl )
You can’t perform that action at this time.
0 commit comments