Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
ZODB
Commits
a0fb33da
Commit
a0fb33da
authored
Nov 19, 2002
by
Guido van Rossum
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move close_storages() call to finally: clause in main().
Rephrase error message about address in use.
parent
b6a12396
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
src/ZEO/runsvr.py
src/ZEO/runsvr.py
+4
-5
No files found.
src/ZEO/runsvr.py
View file @
a0fb33da
...
@@ -202,12 +202,13 @@ class ZEOServer:
...
@@ -202,12 +202,13 @@ class ZEOServer:
def
main
(
self
):
def
main
(
self
):
self
.
check_socket
()
self
.
check_socket
()
self
.
clear_socket
()
self
.
clear_socket
()
try
:
self
.
open_storages
()
self
.
open_storages
()
self
.
setup_signals
()
self
.
setup_signals
()
try
:
self
.
create_server
()
self
.
create_server
()
self
.
loop_forever
()
self
.
loop_forever
()
finally
:
finally
:
self
.
close_storages
()
self
.
clear_socket
()
self
.
clear_socket
()
def
check_socket
(
self
):
def
check_socket
(
self
):
...
@@ -221,7 +222,7 @@ class ZEOServer:
...
@@ -221,7 +222,7 @@ class ZEOServer:
pass
pass
else
:
else
:
s
.
close
()
s
.
close
()
self
.
opts
.
usage
(
"address %r
still
in use"
%
self
.
opts
.
address
)
self
.
opts
.
usage
(
"address %r
already
in use"
%
self
.
opts
.
address
)
def
clear_socket
(
self
):
def
clear_socket
(
self
):
if
isinstance
(
self
.
opts
.
address
,
type
(
""
)):
if
isinstance
(
self
.
opts
.
address
,
type
(
""
)):
...
@@ -293,12 +294,10 @@ class ZEOServer:
...
@@ -293,12 +294,10 @@ class ZEOServer:
def
handle_sigterm
(
self
):
def
handle_sigterm
(
self
):
info
(
"terminated by SIGTERM"
)
info
(
"terminated by SIGTERM"
)
self
.
close_storages
()
sys
.
exit
(
0
)
sys
.
exit
(
0
)
def
handle_sigint
(
self
):
def
handle_sigint
(
self
):
info
(
"terminated by SIGINT"
)
info
(
"terminated by SIGINT"
)
self
.
close_storages
()
sys
.
exit
(
0
)
sys
.
exit
(
0
)
def
handle_sigusr2
(
self
):
def
handle_sigusr2
(
self
):
...
...
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