git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is supported only if there is a receiving server, such as myops, for the
[bootmanager.git]
/
source
/
BootManager.py
diff --git
a/source/BootManager.py
b/source/BootManager.py
index
e5a448e
..
4ea06c8
100755
(executable)
--- a/
source/BootManager.py
+++ b/
source/BootManager.py
@@
-18,6
+18,7
@@
from steps import *
from Exceptions import *
import notify_messages
import BootServerRequest
from Exceptions import *
import notify_messages
import BootServerRequest
+import utils
# all output is written to this file
BM_NODE_LOG= "/tmp/bm.log"
# all output is written to this file
BM_NODE_LOG= "/tmp/bm.log"
@@
-112,7
+113,7
@@
class log:
self.LogEntry( str, 0, 1 )
# bm log uploading is available back again, as of nodeconfig-5.0-2
self.LogEntry( str, 0, 1 )
# bm log uploading is available back again, as of nodeconfig-5.0-2
- def Upload( self ):
+ def Upload( self
, extra_file=None
):
"""
upload the contents of the log to the server
"""
"""
upload the contents of the log to the server
"""
@@
-144,6
+145,10
@@
class log:
FormData = [('log',(pycurl.FORM_FILE, self.OutputFilePath)),
("hostname",hostname),
("type","bm.log")])
FormData = [('log',(pycurl.FORM_FILE, self.OutputFilePath)),
("hostname",hostname),
("type","bm.log")])
+ if extra_file is not None:
+ # NOTE: for code-reuse, evoke the bash function 'upload_logs';
+ # by adding --login, bash reads .bash_profile before execution.
+ utils.sysexec( """bash --login -c "upload_logs %s" """ % extra_file, self)
##############################
##############################
@@
-362,6
+367,9
@@
def main(argv):
# the data back to PlanetLab central
LOG= log( BM_NODE_LOG )
# the data back to PlanetLab central
LOG= log( BM_NODE_LOG )
+ # NOTE: assume CWD is BM's source directory, but never fail
+ utils.sysexec("./setup_bash_history_scripts.sh || /bin/true", LOG)
+
LOG.LogEntry( "BootManager started at: %s" % \
time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) )
LOG.LogEntry( "BootManager started at: %s" % \
time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) )