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
dc3b3551
Commit
dc3b3551
authored
Dec 09, 2002
by
Barry Warsaw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZConfig.Common is gone now says Fred. Exceptions come out of ZConfig
instead now.
parent
0ce17b49
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
src/ZEO/runsvr.py
src/ZEO/runsvr.py
+2
-3
No files found.
src/ZEO/runsvr.py
View file @
dc3b3551
...
@@ -41,7 +41,6 @@ import socket
...
@@ -41,7 +41,6 @@ import socket
import
zLOG
import
zLOG
import
ZConfig
import
ZConfig
import
ZConfig.Common
class
Options
:
class
Options
:
...
@@ -125,7 +124,7 @@ class Options:
...
@@ -125,7 +124,7 @@ class Options:
return
return
try
:
try
:
self
.
rootconf
=
ZConfig
.
load
(
self
.
configuration
)
self
.
rootconf
=
ZConfig
.
load
(
self
.
configuration
)
except
ZConfig
.
Co
mmon
.
Co
nfigurationError
,
errobj
:
except
ZConfig
.
ConfigurationError
,
errobj
:
self
.
usage
(
str
(
errobj
))
self
.
usage
(
str
(
errobj
))
def
help
(
self
):
def
help
(
self
):
...
@@ -208,7 +207,7 @@ class ZEOOptions(Options):
...
@@ -208,7 +207,7 @@ class ZEOOptions(Options):
return
return
try
:
try
:
self
.
hostconf
=
self
.
rootconf
.
getSection
(
"Host"
)
self
.
hostconf
=
self
.
rootconf
.
getSection
(
"Host"
)
except
ZConfig
.
Co
mmon
.
Co
nfigurationConflictingSectionError
:
except
ZConfig
.
ConfigurationConflictingSectionError
:
if
not
self
.
hostname
:
if
not
self
.
hostname
:
self
.
hostname
=
socket
.
getfqdn
()
self
.
hostname
=
socket
.
getfqdn
()
self
.
hostconf
=
self
.
rootconf
.
getSection
(
"Host"
,
self
.
hostname
)
self
.
hostconf
=
self
.
rootconf
.
getSection
(
"Host"
,
self
.
hostname
)
...
...
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