Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
8ca213fc
Commit
8ca213fc
authored
Mar 28, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed bad docstring, minor style
parent
b124e5be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
slapos/grid/watchdog.py
slapos/grid/watchdog.py
+3
-8
No files found.
slapos/grid/watchdog.py
View file @
8ca213fc
...
@@ -36,11 +36,6 @@ def getWatchdogID():
...
@@ -36,11 +36,6 @@ def getWatchdogID():
return
"-on-watch"
return
"-on-watch"
def
parseArgumentTuple
():
def
parseArgumentTuple
():
"""Parses arguments either from command line, from method parameters or from
config file. Then returns a new instance of slapgrid.Slapgrid with those
parameters. Also returns the options dict and unused variable list, and
configures logger.
"""
parser
=
argparse
.
ArgumentParser
()
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
"--master-url"
,
parser
.
add_argument
(
"--master-url"
,
help
=
"The master server URL. Mandatory."
,
help
=
"The master server URL. Mandatory."
,
...
@@ -62,7 +57,7 @@ def parseArgumentTuple():
...
@@ -62,7 +57,7 @@ def parseArgumentTuple():
return
option_dict
return
option_dict
class
Watchdog
():
class
Watchdog
(
object
):
process_state_events
=
[
'PROCESS_STATE_EXITED'
,
'PROCESS_STATE_FATAL'
]
process_state_events
=
[
'PROCESS_STATE_EXITED'
,
'PROCESS_STATE_FATAL'
]
...
@@ -77,7 +72,7 @@ class Watchdog():
...
@@ -77,7 +72,7 @@ class Watchdog():
def
initialize_connection
(
self
,
partition_id
):
def
initialize_connection
(
self
,
partition_id
):
cert_file
=
None
cert_file
=
None
key_file
=
None
key_file
=
None
if
self
.
certificate_repository_path
is
not
None
:
if
self
.
certificate_repository_path
:
cert_file
=
os
.
path
.
join
(
self
.
certificate_repository_path
,
cert_file
=
os
.
path
.
join
(
self
.
certificate_repository_path
,
"%s.crt"
%
partition_id
)
"%s.crt"
%
partition_id
)
key_file
=
os
.
path
.
join
(
self
.
certificate_repository_path
,
key_file
=
os
.
path
.
join
(
self
.
certificate_repository_path
,
...
@@ -94,7 +89,7 @@ class Watchdog():
...
@@ -94,7 +89,7 @@ class Watchdog():
self
.
stderr
.
flush
()
self
.
stderr
.
flush
()
def
run
(
self
):
def
run
(
self
):
while
1
:
while
True
:
self
.
write_stdout
(
'READY
\
n
'
)
self
.
write_stdout
(
'READY
\
n
'
)
line
=
self
.
stdin
.
readline
()
# read header line from stdin
line
=
self
.
stdin
.
readline
()
# read header line from stdin
headers
=
dict
([
x
.
split
(
':'
)
for
x
in
line
.
split
()])
headers
=
dict
([
x
.
split
(
':'
)
for
x
in
line
.
split
()])
...
...
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