Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
itminedu
agkyra
Commits
5d0cf099
Commit
5d0cf099
authored
Nov 08, 2015
by
Giorgos Korfiatis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't attempt server shutdown if gui ended normally
parent
26d915bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
agkyra/cli.py
agkyra/cli.py
+2
-4
agkyra/gui.py
agkyra/gui.py
+1
-0
No files found.
agkyra/cli.py
View file @
5d0cf099
...
...
@@ -513,6 +513,8 @@ class AgkyraCLI(cmd.Cmd):
sys
.
stderr
.
write
(
'GUI interrupted by user, exiting
\n
'
)
sys
.
stderr
.
flush
()
new_gui
.
clean_exit
()
if
self
.
client
:
self
.
_shutdown
(
''
)
except
socket
.
error
as
e
:
if
e
.
errno
==
errno
.
ECONNREFUSED
:
sys
.
stderr
.
write
(
...
...
@@ -523,10 +525,6 @@ class AgkyraCLI(cmd.Cmd):
exit
(
1
)
else
:
raise
LOGGER
.
info
(
'GUI is shutdown'
)
if
self
.
client
:
self
.
_shutdown
(
''
)
else
:
sys
.
stderr
.
write
(
'Session failed to load
\n
'
)
sys
.
stderr
.
flush
()
agkyra/gui.py
View file @
5d0cf099
...
...
@@ -93,6 +93,7 @@ class GUI(WebSocketBaseClient):
LOG
.
debug
(
'Closed GUI connection'
)
except
Exception
as
e
:
LOG
.
warning
(
'While cleaning GUI: %s'
%
e
)
LOG
.
info
(
'GUI is shutdown'
)
def
handshake_ok
(
self
):
"""If handshake OK is, SessionHelper UP goes, so GUI launched can be"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment