Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos.toolbox
Commits
415e50cf
Commit
415e50cf
authored
Dec 17, 2012
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved logging config before setRunning
Conflicts: slapos/agent/agent.py
parent
e0a0719d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
17 deletions
+19
-17
slapos/agent/agent.py
slapos/agent/agent.py
+19
-17
No files found.
slapos/agent/agent.py
View file @
415e50cf
...
@@ -375,27 +375,29 @@ def main():
...
@@ -375,27 +375,29 @@ def main():
key_file_dict
[
cert
]
=
(
temp_key
,
temp_cert
)
key_file_dict
[
cert
]
=
(
temp_key
,
temp_cert
)
return
temp_key
.
name
,
temp_cert
.
name
return
temp_key
.
name
,
temp_cert
.
name
args
=
parser
.
parse_args
()
args
=
parser
.
parse_args
()
log
=
args
.
log
formatter
=
logging
.
Formatter
(
'%(asctime)s %(message)s'
)
logger
=
logging
.
getLogger
()
if
args
.
verbose
:
log_level
=
logging
.
DEBUG
else
:
log_level
=
logging
.
INFO
logger
.
setLevel
(
log_level
)
handler
=
logging
.
StreamHandler
(
sys
.
stdout
)
handler
.
setFormatter
(
formatter
)
logger
.
addHandler
(
handler
)
if
log
:
handler
=
logging
.
FileHandler
(
log
)
handler
.
setFormatter
(
formatter
)
logger
.
addHandler
(
handler
)
log_file
=
open
(
log
)
log_file
.
seek
(
0
,
2
)
pidfile
=
args
.
pidfile
pidfile
=
args
.
pidfile
if
pidfile
:
if
pidfile
:
setRunning
(
pidfile
)
setRunning
(
pidfile
)
try
:
try
:
log
=
args
.
log
formatter
=
logging
.
Formatter
(
'%(asctime)s %(message)s'
)
logger
=
logging
.
getLogger
()
if
args
.
verbose
:
log_level
=
logging
.
DEBUG
else
:
log_level
=
logging
.
INFO
logger
.
setLevel
(
log_level
)
handler
=
logging
.
StreamHandler
(
sys
.
stdout
)
handler
.
setFormatter
(
formatter
)
logger
.
addHandler
(
handler
)
if
log
:
handler
=
logging
.
FileHandler
(
log
)
handler
.
setFormatter
(
formatter
)
logger
.
addHandler
(
handler
)
log_file
=
open
(
log
)
log_file
.
seek
(
0
,
2
)
section_dict
=
collections
.
OrderedDict
()
section_dict
=
collections
.
OrderedDict
()
configuration
=
ConfigParser
.
SafeConfigParser
()
configuration
=
ConfigParser
.
SafeConfigParser
()
configuration
.
readfp
(
args
.
configuration_file
)
configuration
.
readfp
(
args
.
configuration_file
)
...
...
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