[X2Go-Commits] [x2goclient] 45/94: change loglevel option from arg to kwarg parameter
git-admin at x2go.org
git-admin at x2go.org
Fri Dec 15 21:04:42 CET 2023
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to annotated tag 0.1.4.0
in repository x2goclient.
commit 344e4b54924ee801e4a9da9be95ec906cd79ea48
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue May 17 09:16:24 2011 +0200
change loglevel option from arg to kwarg parameter
---
pyhoca/cli/frontend.py | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 45e5cfed..36bc76d1 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -123,7 +123,7 @@ class PyHocaCLI(x2go.X2goClient):
else:
_server = self.args.server
# clean all sessions from X2go server
- self.logger('cleaning up all running sessions from X2go server: %s' % _server, x2go.loglevel_NOTICE, )
+ self.logger('cleaning up all running sessions from X2go server: %s' % _server, loglevel=x2go.loglevel_NOTICE, )
self._X2goClient__clean_sessions(s_hash)
@@ -132,7 +132,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# start a new session and run a command
- self.logger('starting a new X2go session', x2go.loglevel_INFO, )
+ self.logger('starting a new X2go session', loglevel=x2go.loglevel_INFO, )
if self.args.session_profile is None:
self.logger('command for new session is: %s' % self.args.command, loglevel=x2go.loglevel_DEBUG, )
else:
@@ -145,7 +145,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# resume a running session
- self.logger('resuming X2go session: %s' % self.args.resume, x2go.loglevel_INFO, )
+ self.logger('resuming X2go session: %s' % self.args.resume, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.resume in available_sessions.keys():
self._X2goClient__resume_session(s_hash, self.args.resume)
@@ -158,7 +158,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# send a suspend request to a session
- self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, x2go.loglevel_INFO, )
+ self.logger('requesting X2go session suspend of session: %s' % self.args.suspend, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.suspend in available_sessions.keys():
self._X2goClient__suspend_session(s_hash, self.args.suspend)
@@ -171,7 +171,7 @@ class PyHocaCLI(x2go.X2goClient):
STILL UNDOCUMENTED
"""
# send a terminate request to a session
- self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, x2go.loglevel_INFO, )
+ self.logger('requesting X2go session terminate of session: %s' % self.args.terminate, loglevel=x2go.loglevel_INFO, )
available_sessions = self._X2goClient__list_sessions(s_hash)
if self.args.terminate in available_sessions.keys():
self._X2goClient__terminate_session(s_hash, self.args.terminate)
@@ -191,7 +191,7 @@ class PyHocaCLI(x2go.X2goClient):
self._pyhoca_logger.tag = 'PyHocaCLI'
# initialize the X2goClient context and start the connection to the X2go server
- self._pyhoca_logger('preparing requested X2go session', x2go.loglevel_NOTICE, )
+ self._pyhoca_logger('preparing requested X2go session', loglevel=x2go.loglevel_NOTICE, )
x2go.X2goClient.__init__(self, logger=liblogger)
@@ -248,10 +248,12 @@ class PyHocaCLI(x2go.X2goClient):
try:
self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth)
connected = True
- except x2go.AuthenticationException:
+ except x2go.AuthenticationException, e:
force_password_auth = True
+ self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, )
self.args.password = getpass.getpass()
- except x2go.PasswordRequiredException:
+ except x2go.PasswordRequiredException, e:
+ self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=2go.loglevel_NOTICE, )
self.args.password = getpass.getpass()
except x2go.BadHostKeyException:
self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254)
@@ -302,7 +304,7 @@ class PyHocaCLI(x2go.X2goClient):
# give the session some time to come up...
# no CTRL-C is allowed during this phase...
i=0
- self._pyhoca_logger("give the X2go session some time to come up...", x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("give the X2go session some time to come up...", loglevel=x2go.loglevel_NOTICE, )
while i < self.args.time_to_wait:
time.sleep(1)
i+=1
@@ -311,9 +313,9 @@ class PyHocaCLI(x2go.X2goClient):
profile_name = self._X2goClient__get_session_profile_name(self.x2go_session_hash)
session_name = self._X2goClient__get_session_name(self.x2go_session_hash)
- self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, x2go.loglevel_INFO, )
- self._pyhoca_logger("X2go session name is: %s" % session_name, x2go.loglevel_INFO, )
- self._pyhoca_logger("Press CTRL+C to suspend the running session...", x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, )
+ self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, )
try:
session_duration = 0
@@ -327,18 +329,18 @@ class PyHocaCLI(x2go.X2goClient):
time.sleep(2)
if self._X2goClient__has_session_terminated(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has terminated" % session_name, x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2go session %s has terminated" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif self._X2goClient__is_session_suspended(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
elif self._X2goClient__is_session_running(self.x2go_session_hash):
- self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2go session %s has been moved to a different screen" % session_name, loglevel=x2go.loglevel_NOTICE, )
except KeyboardInterrupt:
- self._pyhoca_logger("Suspending X2go session %s" % session_name, x2go.loglevel_INFO, )
+ self._pyhoca_logger("Suspending X2go session %s" % session_name, loglevel=x2go.loglevel_INFO, )
self._X2goClient__suspend_session(self.x2go_session_hash)
# giving nxproxy's SSH tunnel some time to settle
time.sleep(2)
- self._pyhoca_logger("X2go session %s has been suspended" % session_name, x2go.loglevel_NOTICE, )
+ self._pyhoca_logger("X2go session %s has been suspended" % session_name, loglevel=x2go.loglevel_NOTICE, )
except x2go.X2goSessionException, e:
self._pyhoca_logger("X2goSessionException occured:", loglevel=x2go.loglevel_ERROR)
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list