x2go-commits February 2013

x2go-commits@lists.x2go.org

1 participants
165 discussions

x2gobroker.git - master (branch) updated: 0.0.0.1-22-g0aca8ca
by git-admin＠x2go.org 19 Feb '13

19 Feb '13

The branch, master has been updated via 0aca8cade7297dbe428473bcb5ca4e00d4f4bc10 (commit) from 499a783d677c3610974fdffd48573ff5037194a5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0aca8cade7297dbe428473bcb5ca4e00d4f4bc10 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 20:11:48 2013 +0100 remove enforcement to DEBUG loglevel, was test code ----------------------------------------------------------------------- Summary of changes: x2gobroker/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index fdbd881..d52a485 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -39,7 +39,7 @@ else: X2GOBROKER_DEBUG = False if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: X2GOBROKER_DEBUG = True -X2GOBROKER_DEBUG = True + if X2GOBROKER_DEBUG: logger_broker.setLevel(logging.DEBUG) logger_access.setLevel(logging.DEBUG) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-21-g499a783
by git-admin＠x2go.org 19 Feb '13

19 Feb '13

The branch, master has been updated via 499a783d677c3610974fdffd48573ff5037194a5 (commit) from b25ebf6134b77a3e18ba1f7883c27cd29cebe61b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 499a783d677c3610974fdffd48573ff5037194a5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 20:09:36 2013 +0100 remove debug output code ----------------------------------------------------------------------- Summary of changes: x2gobroker/defaults.py | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 4099d57..fdbd881 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -45,10 +45,6 @@ if X2GOBROKER_DEBUG: logger_access.setLevel(logging.DEBUG) logger_error.setLevel(logging.DEBUG) -logger_broker.warn('os.getuid() = %s' % os.getuid()) -logger_broker.warn('os.geteuid() = %s' % os.geteuid()) -logger_broker.warn('getpass.getuser() = %s' % getpass.getuser()) - # check effective UID the broker runs as and complain appropriately... if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER and os.geteuid() != 0: logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=X2GOBROKER_USER, daemon_username=X2GOBROKER_DAEMON_USER)) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-20-gb25ebf6
by git-admin＠x2go.org 19 Feb '13

19 Feb '13

The branch, master has been updated via b25ebf6134b77a3e18ba1f7883c27cd29cebe61b (commit) from 1fe7447ef8efa17ac2fd290cc449c6d1b9078edc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b25ebf6134b77a3e18ba1f7883c27cd29cebe61b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 20:00:33 2013 +0100 properly tabified init script ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-daemon.init | 78 ++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) The diff of changes is: diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init index 1c2d724..7d945ed 100755 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -61,48 +61,48 @@ export X2GOBROKER_SSL_KEYFILE is_true() { - case "${1:-}" in - [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; - *) return 1; - esac + case "${1:-}" in + [Yy]es|[Yy]|1|[Tt]|[Tt]rue) return 0;; + *) return 1; + esac } case "${1:-}" in - start) - if [ -e $PIDFILE ]; then - if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then - log_warning_msg "X2Go Session Broker already running" - else - log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE). Delete it manually!" - fi - START_DAEMON=no - fi - if is_true $START_DAEMON; then - log_daemon_msg "Starting X2Go Session Broker standalone daemon" $(basename $DAEMON) - set +e - start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS - log_end_msg $? - set -e - fi - ;; - stop) - if [ -f $PIDFILE ] ; then - log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "x2gobroker" - set +e - start-stop-daemon -K -p $PIDFILE - rm -f $PIDFILE - log_end_msg $? - set -e - fi - ;; - restart|reload|force-reload) - ${0:-} stop - ${0:-} start - ;; - *) - echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; + start) + if [ -e $PIDFILE ]; then + if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then + log_warning_msg "X2Go Session Broker already running" + else + log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE). Delete it manually!" + fi + START_DAEMON=no + fi + if is_true $START_DAEMON; then + log_daemon_msg "Starting X2Go Session Broker standalone daemon" $(basename $DAEMON) + set +e + start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS + log_end_msg $? + set -e + fi + ;; + stop) + if [ -f $PIDFILE ] ; then + log_daemon_msg "Stopping X2Go Session Broker standalone daemon" "x2gobroker" + set +e + start-stop-daemon -K -p $PIDFILE + rm -f $PIDFILE + log_end_msg $? + set -e + fi + ;; + restart|reload|force-reload) + ${0:-} stop + ${0:-} start + ;; + *) + echo "Usage: ${0:-} {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; esac exit 0 hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-19-g1fe7447
by git-admin＠x2go.org 19 Feb '13

19 Feb '13

The branch, master has been updated via 1fe7447ef8efa17ac2fd290cc449c6d1b9078edc (commit) via 43e490a1fa111dde08d7b05d73fe144c3ca24b52 (commit) via 58da6a1d6504def84dccbc9f3328cca439fefa3b (commit) via f1ea959ac2800e88d57018b80b648f7ab48fc9a8 (commit) via 80fd7e03f7094ef1dcc3e61d9d4e30a5020ed78a (commit) from b5df92c61e0c84ec314b29acc60e635d43f3b7b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1fe7447ef8efa17ac2fd290cc449c6d1b9078edc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 19:57:56 2013 +0100 /debian/x2gobroker-daemon.init: Handle stale PID file and already running daemon. commit 43e490a1fa111dde08d7b05d73fe144c3ca24b52 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 19:44:01 2013 +0100 Make sure the unprivileged daemon user (x2gobroker) has access to the PID file directory. commit 58da6a1d6504def84dccbc9f3328cca439fefa3b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 19:28:31 2013 +0100 Handle different situation for X2GOBROKER_DAEMON_USER. Make sure the getpass.getuser() function sees the correct effective UID. commit f1ea959ac2800e88d57018b80b648f7ab48fc9a8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 18:58:52 2013 +0100 typo fix commit 80fd7e03f7094ef1dcc3e61d9d4e30a5020ed78a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 18:52:27 2013 +0100 Make the daemon user ID configurable through x2gobroker-daemon.default. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ debian/x2gobroker-daemon.default | 6 ++++++ debian/x2gobroker-daemon.init | 30 +++++++++++++++++++++++++----- x2gobroker/defaults.py | 14 ++++++++++++-- x2gobroker/loggers.py | 9 +++++---- 5 files changed, 55 insertions(+), 11 deletions(-) mode change 100644 => 100755 debian/x2gobroker-daemon.init The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9ed8b0d..ba7337d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,15 @@ x2gobroker (0.0.0.2-0~x2go1) UNRELEASED; urgency=low - Add foundation for logging support. - Add man page for x2gobroker executable. - Add logrotate configuration for x2gobroker log files. + - Make the daemon user ID configurable through x2gobroker-daemon.default. + - Handle different situation for X2GOBROKER_DAEMON_USER. Make sure + the getpass.getuser() function sees the correct effective UID. + - Make sure the unprivileged daemon user (x2gobroker) has access to the + PID file directory. * /debian/control: + Add bin:package x2gobroker-agent. + * /debian/x2gobroker-daemon.init: + + Handle stale PID file and already running daemon. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 13 Feb 2013 12:03:25 +0100 diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default index 452a75b..8b8bea2 100644 --- a/debian/x2gobroker-daemon.default +++ b/debian/x2gobroker-daemon.default @@ -3,6 +3,12 @@ # Uncomment to enable the X2Go Session Broker standalone daemon START_DAEMON=true +# the posix user ID the broker runs under (do not change!) +# if you change it nonetheless, make sure that the log file +# directory (default: /var/log/x2gobroker) and files in there are +# writable by that user +#X2GOBROKER_DAEMON_USER=x2gobroker + # run XGo Session Broker in debug mode, this will make the broker # available through http GET method calls (otherwise: POST method # only) and you will be able to test the broker through your web diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init old mode 100644 new mode 100755 index d14bb8f..1c2d724 --- a/debian/x2gobroker-daemon.init +++ b/debian/x2gobroker-daemon.init @@ -19,8 +19,8 @@ set -eu DAEMON=/usr/sbin/x2gobroker -test -d /run && RUNDIR=/run/ || RUNDIR=/var/run -PIDFILE=$RUNDIR/x2gobroker-daemon.pid +test -d /run && RUNDIR=/run || RUNDIR=/var/run +PIDFILE=$RUNDIR/x2gobroker/x2gobroker-daemon.pid DEBIANCONFIG=/etc/default/x2gobroker-daemon test -x "$DAEMON" || exit 0 @@ -28,6 +28,7 @@ test -x "$DAEMON" || exit 0 START_DAEMON=false DAEMON_BIND_ADDRESS=127.0.0.1:8080 X2GOBROKER_DEBUG=0 +X2GOBROKER_DAEMON_USER='x2gobroker' X2GOBROKER_DEFAULT_BACKEND="zeroconf" X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" @@ -36,7 +37,19 @@ X2GOBROKER_SSL_CERTFILE= X2GOBROKER_SSL_KEYFILE= test -f $DEBIANCONFIG && . $DEBIANCONFIG +if ! getent passwd $X2GOBROKER_DAEMON_USER 1>/dev/null 2>/dev/null; then + X2GOBROKER_DAEMON_USER=nobody +fi + +# create PID directory +mkdir -p $RUNDIR/x2gobroker +chown $X2GOBROKER_DAEMON_USER:nogroup $RUNDIR/x2gobroker +chmod 0700 $RUNDIR/x2gobroker + +export LOGNAME=$X2GOBROKER_DAEMON_USER + export X2GOBROKER_DEBUG +export X2GOBROKER_DAEMON_USER export X2GOBROKER_CONFIG export X2GOBROKER_DEFAULT_BACKEND export X2GOBROKER_SESSIONPROFILES @@ -56,11 +69,18 @@ is_true() case "${1:-}" in start) + if [ -e $PIDFILE ]; then + if ps -u $X2GOBROKER_DAEMON_USER | grep $(basename $DAEMON) 1>/dev/null 2>/dev/null; then + log_warning_msg "X2Go Session Broker already running" + else + log_warning_msg "X2Go Session Broker: stale PID file ($PIDFILE). Delete it manually!" + fi + START_DAEMON=no + fi if is_true $START_DAEMON; then - log_daemon_msg "Starting X2Go Session Broker standalone daemon" "x2gobroker" - mkdir -p $RUNDIR + log_daemon_msg "Starting X2Go Session Broker standalone daemon" $(basename $DAEMON) set +e - start-stop-daemon -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS + start-stop-daemon --chuid $X2GOBROKER_DAEMON_USER -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS log_end_msg $? set -e fi diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 1f250c2..4099d57 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -39,15 +39,25 @@ else: X2GOBROKER_DEBUG = False if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: X2GOBROKER_DEBUG = True - +X2GOBROKER_DEBUG = True if X2GOBROKER_DEBUG: logger_broker.setLevel(logging.DEBUG) logger_access.setLevel(logging.DEBUG) logger_error.setLevel(logging.DEBUG) -if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: +logger_broker.warn('os.getuid() = %s' % os.getuid()) +logger_broker.warn('os.geteuid() = %s' % os.geteuid()) +logger_broker.warn('getpass.getuser() = %s' % getpass.getuser()) + +# check effective UID the broker runs as and complain appropriately... +if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER and os.geteuid() != 0: logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=X2GOBROKER_USER, daemon_username=X2GOBROKER_DAEMON_USER)) logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') +elif X2GOBROKER_DAEMON_USER != 'root' and os.geteuid() == 0: + logger_broker.warn('X2Go Session Broker should not be run as root, better run as user {daemon_username}.'.format(daemon_username=X2GOBROKER_DAEMON_USER)) +elif os.geteuid() == 0: + logger_broker.warn('X2Go Session Broker should not be run as root, better run as non-privileged user') + logger_broker.info('Setting up the broker\'s environment...') logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=X2GOBROKER_DEBUG)) diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index e35a9a7..7791bbd 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -25,9 +25,11 @@ import getpass import logging import logging.config -X2GOBROKER_DAEMON_USER = 'x2gobroker' - # normally this would go into defaults.py, however, we do not want to create a dependency loop between loggers.py and defaults.py... +if os.environ.has_key('X2GOBROKER_DAEMON_USER'): + X2GOBROKER_DAEMON_USER=os.environ['X2GOBROKER_DAEMON_USER'] +else: + X2GOBROKER_DAEMON_USER="x2gobroker" if os.environ.has_key('X2GOBROKER_LOGCONFIG'): X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] else: @@ -37,7 +39,7 @@ else: if getpass.getuser() == X2GOBROKER_DAEMON_USER: # we run in standalone daemon mode, so let's use the system configuration for logging - logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) + logging.config.fileConfig(X2GOBROKER_LOGCONFIG) # create loggers logger_broker = logging.getLogger('broker') @@ -63,4 +65,3 @@ else: logger_error = logging.getLogger('error') logger_error.addHandler(stdout_handler) logger_error.propagate = 0 - hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.0.1-14-gb5df92c
by git-admin＠x2go.org 19 Feb '13

19 Feb '13

The branch, master has been updated via b5df92c61e0c84ec314b29acc60e635d43f3b7b0 (commit) from 5ef433db9f943afd56b15351cceb2021184ed43e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b5df92c61e0c84ec314b29acc60e635d43f3b7b0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Feb 19 18:36:23 2013 +0100 add some first logging output ----------------------------------------------------------------------- Summary of changes: x2gobroker/defaults.py | 74 ++++++++++++++++++++++++++++++++---------------- x2gobroker/loggers.py | 32 +++++++++++++++++---- 2 files changed, 76 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index b85a296..1f250c2 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -22,50 +22,76 @@ # modules import os import uuid +import getpass -# the home directory of the user that the daemon/cgi runs as -X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~')) +import logging +from loggers import logger_broker, logger_access, logger_error, X2GOBROKER_DAEMON_USER -if os.environ.has_key('X2GOBROKER_CONFIG'): - X2GOBROKER_CONFIG=os.environ['X2GOBROKER_CONFIG'] -else: - X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf" +X2GOBROKER_USER = getpass.getuser() -if os.environ.has_key('X2GOBROKER_LOGCONFIG'): - X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] -else: - X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" +### +### dynamic default values, influencable through os.environ... +### -if os.environ.has_key('X2GOBROKER_SESSIONPROFILES'): - X2GOBROKER_SESSIONPROFILES=os.environ['X2GOBROKER_SESSIONPROFILES'] +if os.environ.has_key('X2GOBROKER_DEBUG'): + X2GOBROKER_DEBUG = ( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) else: - X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf" + X2GOBROKER_DEBUG = False +if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: + X2GOBROKER_DEBUG = True -if os.environ.has_key('X2GOBROKER_DEBUG'): - X2GOBROKER_DEBUG=( os.environ['X2GOBROKER_DEBUG'].lower() in ('1', 'on', 'true', 'yes', ) ) +if X2GOBROKER_DEBUG: + logger_broker.setLevel(logging.DEBUG) + logger_access.setLevel(logging.DEBUG) + logger_error.setLevel(logging.DEBUG) + +if X2GOBROKER_USER != X2GOBROKER_DAEMON_USER: + logger_broker.warn('X2Go Session Broker has been started interactively by user {username}, better run as user {daemon_username}.'.format(username=X2GOBROKER_USER, daemon_username=X2GOBROKER_DAEMON_USER)) + logger_broker.info('Automatically switching to DEBUG mode due to interactive launch of this application.') +logger_broker.info('Setting up the broker\'s environment...') +logger_broker.info(' X2GOBROKER_DEBUG: {value}'.format(value=X2GOBROKER_DEBUG)) + +if os.environ.has_key('X2GOBROKER_CONFIG'): + X2GOBROKER_CONFIG = os.environ['X2GOBROKER_CONFIG'] else: - X2GOBROKER_DEBUG=False + X2GOBROKER_CONFIG = "/etc/x2go/x2gobroker.conf" +logger_broker.info(' X2GOBROKER_CONFIG: {value}'.format(value=X2GOBROKER_CONFIG)) + +X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" if os.environ.has_key('X2GOBROKER_AGENT_CMD'): - X2GOBROKER_AGENT_CMD=os.environ['X2GOBROKER_AGENT_CMD'] + X2GOBROKER_AGENT_CMD = os.environ['X2GOBROKER_AGENT_CMD'] else: - X2GOBROKER_AGENT_CMD="/usr/lib/x2go/x2gobroker-agent" + X2GOBROKER_AGENT_CMD = "/usr/lib/x2go/x2gobroker-agent" +logger_broker.info(' X2GOBROKER_AGENT_CMD: {value}'.format(value=X2GOBROKER_AGENT_CMD)) if os.environ.has_key('X2GOBROKER_DEFAULT_BACKEND'): - X2GOBROKER_DEFAULT_BACKEND=os.environ['X2GOBROKER_DEFAULT_BACKEND'] + X2GOBROKER_DEFAULT_BACKEND = os.environ['X2GOBROKER_DEFAULT_BACKEND'] else: - X2GOBROKER_DEFAULT_BACKEND="zeroconf" + X2GOBROKER_DEFAULT_BACKEND = "zeroconf" +logger_broker.info(' X2GOBROKER_DEFAULT_BACKEND: {value}'.format(value=X2GOBROKER_DEFAULT_BACKEND)) if os.environ.has_key('X2GOBROKER_SSL_CERTFILE'): - X2GOBROKER_SSL_CERTFILE=os.environ['X2GOBROKER_SSL_CERTFILE'] + X2GOBROKER_SSL_CERTFILE = os.environ['X2GOBROKER_SSL_CERTFILE'] else: - X2GOBROKER_SSL_CERTFILE="" + X2GOBROKER_SSL_CERTFILE = "" +logger_broker.info(' X2GOBROKER_SSL_CERTFILE: {value}'.format(value=X2GOBROKER_SSL_CERTFILE)) if os.environ.has_key('X2GOBROKER_SSL_KEYFILE'): - X2GOBROKER_SSL_KEYFILE=os.environ['X2GOBROKER_SSL_KEYFILE'] + X2GOBROKER_SSL_KEYFILE = os.environ['X2GOBROKER_SSL_KEYFILE'] else: - X2GOBROKER_SSL_KEYFILE="" + X2GOBROKER_SSL_KEYFILE = "" +logger_broker.info(' X2GOBROKER_SSL_KEYFILE: {value}'.format(value=X2GOBROKER_SSL_KEYFILE)) + +### +### static / hard-coded defaults +### + +X2GOBROKER_SESSIONPROFILES = "/etc/x2go/broker/x2gobroker-sessionprofiles.conf" + +# the home directory of the user that the daemon/cgi runs as +X2GOBROKER_HOME = os.path.normpath(os.path.expanduser('~')) # defaults for X2Go Sessino Broker configuration file X2GOBROKER_CONFIG_DEFAULTS = { diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 7151fd5..e35a9a7 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -19,14 +19,22 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +import os import sys import getpass import logging import logging.config -from x2gobroker.defaults import X2GOBROKER_LOGCONFIG as _X2GOBROKER_LOGCONFIG +X2GOBROKER_DAEMON_USER = 'x2gobroker' -if getpass.getuser() == "x2gobroker": +# normally this would go into defaults.py, however, we do not want to create a dependency loop between loggers.py and defaults.py... +if os.environ.has_key('X2GOBROKER_LOGCONFIG'): + X2GOBROKER_LOGCONFIG=os.environ['X2GOBROKER_LOGCONFIG'] +else: + X2GOBROKER_LOGCONFIG="/etc/x2go/broker/x2gobroker-loggers.conf" + +# standalone daemon mode (x2gobroker-daemon) or interactive mode (called from the cmdline)? +if getpass.getuser() == X2GOBROKER_DAEMON_USER: # we run in standalone daemon mode, so let's use the system configuration for logging logging.config.fileConfig(_X2GOBROKER_LOGCONFIG) @@ -38,9 +46,21 @@ if getpass.getuser() == "x2gobroker": else: logger_root = logging.getLogger() - logger_root.addHandler(logging.StreamHandler(sys.stdout)) + stdout_handler = logging.StreamHandler(sys.stdout) + stdout_handler.setFormatter(logging.Formatter(fmt='%(asctime)s - %(name)s - %(levelname)s - %(message)s', datefmt='')) + + # all loggers stream to stdout... + logger_root.addHandler(stdout_handler) + + logger_broker = logging.getLogger('broker') + logger_broker.addHandler(stdout_handler) + logger_broker.propagate = 0 + + logger_access = logging.getLogger('access') + logger_access.addHandler(stdout_handler) + logger_access.propagate = 0 - logger_broker = logger_root - logger_access = logger_root - logger_error = logger_root + logger_error = logging.getLogger('error') + logger_error.addHandler(stdout_handler) + logger_error.propagate = 0 hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goclient2.git - master (branch) updated: 3f2d20b4cc2804a5cd0b68e6f3113c1d9bbf53e4
by git-admin＠x2go.org 19 Feb '13

19 Feb '13

The branch, master has been updated via 3f2d20b4cc2804a5cd0b68e6f3113c1d9bbf53e4 (commit) from 95f154232125bbd92fa573e67f40f7b56765971c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3f2d20b4cc2804a5cd0b68e6f3113c1d9bbf53e4 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Tue Feb 19 15:32:05 2013 +0100 continue developing SessionStatusForm ----------------------------------------------------------------------- Summary of changes: mainwindow.h | 2 +- profile.ui | 3 + sessionstatusframe.cpp | 18 +- sessionstatusframe.h | 8 +- sessionstatusframe.ui | 278 +------------------- ...chbar.cpp => sessionstatusframeapplications.cpp | 9 +- searchbar.h => sessionstatusframeapplications.h | 22 +- sessionstatusframeapplications.ui | 134 ++++++++++ sessionstatusframestatus.cpp | 78 ++++++ sessionstatusframe.h => sessionstatusframestatus.h | 21 +- sessionstatusframestatus.ui | 256 ++++++++++++++++++ x2goapplication.cpp | 8 +- x2goapplication.h | 6 +- x2goclient2.pro | 6 + 14 files changed, 539 insertions(+), 310 deletions(-) copy searchbar.cpp => sessionstatusframeapplications.cpp (82%) copy searchbar.h => sessionstatusframeapplications.h (75%) create mode 100644 sessionstatusframeapplications.ui create mode 100644 sessionstatusframestatus.cpp copy sessionstatusframe.h => sessionstatusframestatus.h (74%) create mode 100644 sessionstatusframestatus.ui The diff of changes is: diff --git a/mainwindow.h b/mainwindow.h index 30b40c6..9dba613 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * oleksandr.shneyder(a)obviously-nice.de * * * * This program is free software; you can redistribute it and/or modify * diff --git a/profile.ui b/profile.ui index 700d80a..6a74f7c 100644 --- a/profile.ui +++ b/profile.ui @@ -83,6 +83,9 @@ </item> <item> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="leftMargin"> + <number>8</number> + </property> <property name="rightMargin"> <number>0</number> </property> diff --git a/sessionstatusframe.cpp b/sessionstatusframe.cpp index 270e1fd..6ad9691 100644 --- a/sessionstatusframe.cpp +++ b/sessionstatusframe.cpp @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -19,14 +19,19 @@ ***************************************************************************/ #include "sessionstatusframe.h" -#include <QScrollBar> + +#include "sessionstatusframestatus.h" +#include "sessionstatusframeapplications.h" + SessionStatusFrame::SessionStatusFrame(QWidget* parent, Qt::WindowFlags f): QFrame(parent, f) { setupUi(this); - teAdvancedStatus->hide(); - teAdvancedStatus->verticalScrollBar()->setStyleSheet( - "background-color:transparent;border-top:0px;border-left:0px;border-right:0px;border-bottom:0px"); + + frStatus=new SessionStatusFrameStatus(this); + frApps=new SessionStatusFrameApplications(this); + ((QVBoxLayout*)layout())->addWidget(frStatus); + ((QVBoxLayout*)layout())->addWidget(frApps); setFrame(pbStatus); } @@ -40,6 +45,7 @@ void SessionStatusFrame::slotSetTabFrames() setFrame(pbApps); setFrame(pbFolders); setFrame(pbStatus); + frStatus->checkWorkAreaScrolling(); } void SessionStatusFrame::setFrame(QPushButton* button) @@ -48,4 +54,6 @@ void SessionStatusFrame::setFrame(QPushButton* button) button->setStyleSheet("border-image:url(:svg/frame.svg);border-top:5px;border-left:5px;border-right:5px;border-bottom:5px"); else button->setStyleSheet("border-image:url(:svg/transparent.svg);border-top:5px;border-left:5px;border-right:5px;border-bottom:5px"); + frStatus->setVisible(pbStatus->isChecked()); + frApps->setVisible(pbApps->isChecked()); } diff --git a/sessionstatusframe.h b/sessionstatusframe.h index 02fc804..39f9be9 100644 --- a/sessionstatusframe.h +++ b/sessionstatusframe.h @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -24,6 +24,9 @@ #include <QFrame> #include "ui_sessionstatusframe.h" +class SessionStatusFrameStatus; +class SessionStatusFrameApplications; + class SessionStatusFrame : public QFrame, public Ui_SessionStatusFrame { Q_OBJECT @@ -34,6 +37,9 @@ private slots: void slotSetTabFrames(); private: void setFrame(QPushButton* button); +private: + SessionStatusFrameStatus* frStatus; + SessionStatusFrameApplications* frApps; }; #endif // SESSIONSTATUSFRAME_H diff --git a/sessionstatusframe.ui b/sessionstatusframe.ui index 9f0bf87..b748ad4 100644 --- a/sessionstatusframe.ui +++ b/sessionstatusframe.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>644</width> - <height>415</height> + <width>571</width> + <height>99</height> </rect> </property> <property name="windowTitle"> @@ -23,6 +23,12 @@ <enum>QFrame::Raised</enum> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>5</number> + </property> + <property name="rightMargin"> + <number>5</number> + </property> <item> <layout class="QHBoxLayout" name="horizontalLayout"> <property name="spacing"> @@ -103,236 +109,6 @@ </item> </layout> </item> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="title"> - <string/> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <layout class="QGridLayout" name="gridLayout"> - <property name="horizontalSpacing"> - <number>10</number> - </property> - <item row="1" column="1"> - <widget class="QLabel" name="lServer"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_4"> - <property name="font"> - - <weight>75</weight> - <bold>true</bold> - - </property> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Session ID:</string> - </property> - </widget> - </item> - <item row="5" column="1"> - <widget class="QLabel" name="lCrTime"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_5"> - <property name="font"> - - <weight>75</weight> - <bold>true</bold> - - </property> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Display:</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLabel" name="lDisplay"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_3"> - <property name="font"> - - <weight>75</weight> - <bold>true</bold> - - </property> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Login:</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLabel" name="lSID"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_11"> - <property name="font"> - - <weight>75</weight> - <bold>true</bold> - - </property> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Creation time:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="lStatus"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>not running</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="font"> - - <weight>75</weight> - <bold>true</bold> - - </property> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Server:</string> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="font"> - - <weight>75</weight> - <bold>true</bold> - - </property> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Status:</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLabel" name="lLogin"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="0" column="2"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QTextEdit" name="teAdvancedStatus"> - <property name="styleSheet"> - <string notr="true">border-image:url(:svg/frame.svg);border-top:1px;border-left:1px;border-right:1px;border-bottom:1px</string> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAsNeeded</enum> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="checkBox"> - <property name="styleSheet"> - <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> - </property> - <property name="text"> - <string>Show details</string> - </property> - </widget> - </item> - </layout> - </widget> - </item> </layout> </widget> <resources> @@ -340,22 +116,6 @@ </resources> <connections> <connection> - <sender>checkBox</sender> - <signal>toggled(bool)</signal> - <receiver>teAdvancedStatus</receiver> - <slot>setVisible(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>99</x> - <y>364</y> - </hint> - <hint type="destinationlabel"> - <x>147</x> - <y>277</y> - </hint> - </hints> - </connection> - <connection> <sender>pbStatus</sender> <signal>toggled(bool)</signal> <receiver>SessionStatusFrame</receiver> @@ -367,7 +127,7 @@ </hint> <hint type="destinationlabel"> <x>19</x> - <y>200</y> + <y>98</y> </hint> </hints> </connection> @@ -383,7 +143,7 @@ </hint> <hint type="destinationlabel"> <x>17</x> - <y>248</y> + <y>98</y> </hint> </hints> </connection> @@ -399,23 +159,7 @@ </hint> <hint type="destinationlabel"> <x>13</x> - <y>299</y> - </hint> - </hints> - </connection> - <connection> - <sender>pbStatus</sender> - <signal>toggled(bool)</signal> - <receiver>groupBox</receiver> - <slot>setVisible(bool)</slot> - <hints> - <hint type="sourcelabel"> - <x>62</x> - <y>42</y> - </hint> - <hint type="destinationlabel"> - <x>40</x> - <y>89</y> + <y>98</y> </hint> </hints> </connection> diff --git a/searchbar.cpp b/sessionstatusframeapplications.cpp similarity index 82% copy from searchbar.cpp copy to sessionstatusframeapplications.cpp index e3bb525..249bbcc 100644 --- a/searchbar.cpp +++ b/sessionstatusframeapplications.cpp @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -19,15 +19,14 @@ ***************************************************************************/ -#include "searchbar.h" +#include "sessionstatusframeapplications.h" -SearchBar::SearchBar(QWidget* parent, Qt::WindowFlags f): QFrame( parent, f) +SessionStatusFrameApplications::SessionStatusFrameApplications(QWidget* parent, Qt::WindowFlags f): QFrame(parent, f) { setupUi(this); - lineEdit->setFocus(); } -SearchBar::~SearchBar() +SessionStatusFrameApplications::~SessionStatusFrameApplications() { } diff --git a/searchbar.h b/sessionstatusframeapplications.h similarity index 75% copy from searchbar.h copy to sessionstatusframeapplications.h index d859cc7..4fc8567 100644 --- a/searchbar.h +++ b/sessionstatusframeapplications.h @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -18,23 +18,19 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef SEARCHBAR_H -#define SEARCHBAR_H + +#ifndef SESSIONSTATUSFRAMEAPPLICATIONS_H +#define SESSIONSTATUSFRAMEAPPLICATIONS_H #include <QFrame> -#include "ui_searchbar.h" +#include "ui_sessionstatusframeapplications.h" -class SearchBar : public QFrame, public Ui_searchBar +class SessionStatusFrameApplications : public QFrame, public Ui_SessionStatusFrameApplications { Q_OBJECT public: - SearchBar(QWidget* parent = 0, Qt::WindowFlags f = 0); - ~SearchBar(); - QLineEdit* getLineEdit() - { - return lineEdit; - } - + explicit SessionStatusFrameApplications(QWidget* parent = 0, Qt::WindowFlags f = 0); + virtual ~SessionStatusFrameApplications(); }; -#endif // SEARCHBAR_H +#endif // SESSIONSTATUSFRAMEAPPLICATIONS_H diff --git a/sessionstatusframeapplications.ui b/sessionstatusframeapplications.ui new file mode 100644 index 0000000..dc26415 --- /dev/null +++ b/sessionstatusframeapplications.ui @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SessionStatusFrameApplications</class> + <widget class="QFrame" name="SessionStatusFrameApplications"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>459</width> + <height>339</height> + </rect> + </property> + <property name="windowTitle"> + <string>Frame</string> + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="margin"> + <number>0</number> + </property> + <item> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QTreeWidget" name="treeWidget"> + <property name="styleSheet"> + <string notr="true">border-image:url(:svg/frame.svg);border-top:1px;border-left:1px;border-right:1px;border-bottom:1px</string> + </property> + <property name="iconSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="rootIsDecorated"> + <bool>true</bool> + </property> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> + <property name="itemsExpandable"> + <bool>true</bool> + </property> + <property name="sortingEnabled"> + <bool>false</bool> + </property> + <property name="expandsOnDoubleClick"> + <bool>false</bool> + </property> + <attribute name="headerVisible"> + <bool>false</bool> + </attribute> + <column> + <property name="text"> + <string notr="true">1</string> + </property> + </column> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Search:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit"> + <property name="styleSheet"> + <string notr="true">border-image:url(:svg/frame.svg);border-top:1px;border-left:1px;border-right:1px;border-bottom:1px</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="startButton"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="styleSheet"> + <string notr="true">border-image:url(:svg/frame.svg);border-top:5px;border-left:5px;border-right:5px;border-bottom:5px</string> + </property> + <property name="text"> + <string>&Start</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/sessionstatusframestatus.cpp b/sessionstatusframestatus.cpp new file mode 100644 index 0000000..66926c9 --- /dev/null +++ b/sessionstatusframestatus.cpp @@ -0,0 +1,78 @@ +/************************************************************************** +* Copyright (C) 2005-2013 by Oleksandr Shneyder * +* o.shneyder(a)phoca-gmbh.de * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU General Public License * +* along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ + + +#include "sessionstatusframestatus.h" +#include <QScrollBar> +#include "x2goapplication.h" +#include "workarea.h" + +SessionStatusFrameStatus::SessionStatusFrameStatus(QWidget* parent, Qt::WindowFlags f): QFrame(parent, f) +{ + setupUi(this); + teAdvancedStatus->hide(); + + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + teAdvancedStatus->append("yxcyxjcbnmsdbamfnbsdmnfbmnsad\nardjgjhasdgjhasdg\nasdhaskjdhjkasd"); + + teAdvancedStatus->verticalScrollBar()->setStyleSheet( + "background-color:transparent;border-top:0px;border-left:0px;border-right:0px;border-bottom:0px"); + connect(cbDetails, SIGNAL(clicked()), this, SLOT(SlotDetailCliecked())); +} + +SessionStatusFrameStatus::~SessionStatusFrameStatus() +{ + +} + +void SessionStatusFrameStatus::SlotDetailCliecked() +{ + teAdvancedStatus->setVisible(cbDetails->isChecked()); + checkWorkAreaScrolling(); +} + +void SessionStatusFrameStatus::checkWorkAreaScrolling() +{ + X2GoApplication::instance()->get_workArea()->set_animateNextScroll(false); + X2GoApplication::instance()->get_workArea()->slotScrollToSessionForm(); +} diff --git a/sessionstatusframe.h b/sessionstatusframestatus.h similarity index 74% copy from sessionstatusframe.h copy to sessionstatusframestatus.h index 02fc804..0a1d17c 100644 --- a/sessionstatusframe.h +++ b/sessionstatusframestatus.h @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -18,22 +18,21 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef SESSIONSTATUSFRAME_H -#define SESSIONSTATUSFRAME_H +#ifndef SESSIONSTATUSFRAMESTATUS_H +#define SESSIONSTATUSFRAMESTATUS_H #include <QFrame> -#include "ui_sessionstatusframe.h" +#include "ui_sessionstatusframestatus.h" -class SessionStatusFrame : public QFrame, public Ui_SessionStatusFrame +class SessionStatusFrameStatus : public QFrame, public Ui_SessionStatusFrameStatus { Q_OBJECT public: - explicit SessionStatusFrame(QWidget* parent = 0, Qt::WindowFlags f = 0); - virtual ~SessionStatusFrame(); + explicit SessionStatusFrameStatus(QWidget* parent = 0, Qt::WindowFlags f = 0); + virtual ~SessionStatusFrameStatus(); + void checkWorkAreaScrolling(); private slots: - void slotSetTabFrames(); -private: - void setFrame(QPushButton* button); + void SlotDetailCliecked(); }; -#endif // SESSIONSTATUSFRAME_H +#endif // SESSIONSTATUSFRAMESTATUS_H diff --git a/sessionstatusframestatus.ui b/sessionstatusframestatus.ui new file mode 100644 index 0000000..9a89d54 --- /dev/null +++ b/sessionstatusframestatus.ui @@ -0,0 +1,256 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>SessionStatusFrameStatus</class> + <widget class="QFrame" name="SessionStatusFrameStatus"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>624</width> + <height>257</height> + </rect> + </property> + <property name="windowTitle"> + <string>Frame</string> + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="lineWidth"> + <number>2</number> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>10</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <layout class="QGridLayout" name="gridLayout"> + <property name="horizontalSpacing"> + <number>10</number> + </property> + <property name="verticalSpacing"> + <number>5</number> + </property> + <item row="1" column="1"> + <widget class="QLabel" name="lServer"> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_4"> + <property name="font"> + + <weight>75</weight> + <bold>true</bold> + + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Session ID:</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QLabel" name="lCrTime"> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_5"> + <property name="font"> + + <weight>75</weight> + <bold>true</bold> + + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Display:</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="lDisplay"> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_3"> + <property name="font"> + + <weight>75</weight> + <bold>true</bold> + + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Login:</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="lSID"> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_11"> + <property name="font"> + + <weight>75</weight> + <bold>true</bold> + + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Creation time:</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="lStatus"> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>not running</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="font"> + + <weight>75</weight> + <bold>true</bold> + + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Server:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="font"> + + <weight>75</weight> + <bold>true</bold> + + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Status:</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="lLogin"> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item row="0" column="2"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QTextEdit" name="teAdvancedStatus"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="styleSheet"> + <string notr="true">border-image:url(:svg/frame.svg);border-top:1px;border-left:1px;border-right:1px;border-bottom:1px</string> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAsNeeded</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="cbDetails"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="styleSheet"> + <string notr="true">border-top:0px;border-left:0px;border-right:0px;border-bottom:0px</string> + </property> + <property name="text"> + <string>Show details</string> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> + <slots> + <slot>slotLayoutChanged()</slot> + </slots> +</ui> diff --git a/x2goapplication.cpp b/x2goapplication.cpp index bece575..ffc6992 100644 --- a/x2goapplication.cpp +++ b/x2goapplication.cpp @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -167,21 +167,21 @@ const nameTranslator* X2GoApplication::getTranslator(QList< nameTranslator >& li void X2GoApplication::initProfiles() { - QList<PSort> sortList; + QList<ProfileSortPtr> sortList; foreach(QString profileId, sessionSettings->get_setting()->childGroups()) { if(profileId=="embedded") continue; Profile* profile=new Profile(profileId, profileForm->getScrollArea()->widget()); profile->loadProfile(); - PSort psort; + ProfileSortPtr psort; psort.ptr=(void*) profile; psort.name=profile->get_profileName(); sortList<<psort; } qSort(sortList); profiles.clear(); - foreach(PSort psrt, sortList) + foreach(ProfileSortPtr psrt, sortList) { profiles<<(Profile*)psrt.ptr; } diff --git a/x2goapplication.h b/x2goapplication.h index 2cddbd9..03ca252 100644 --- a/x2goapplication.h +++ b/x2goapplication.h @@ -1,5 +1,5 @@ /************************************************************************** -* Copyright (C) 2005-2012 by Oleksandr Shneyder * +* Copyright (C) 2005-2013 by Oleksandr Shneyder * * o.shneyder(a)phoca-gmbh.de * * * * This program is free software; you can redistribute it and/or modify * @@ -52,11 +52,11 @@ struct nameTranslator QString internName; }; -struct PSort +struct ProfileSortPtr { void* ptr; QString name; - bool operator<(const PSort& t2) const + bool operator<(const ProfileSortPtr& t2) const { return (name.compare(t2.name, Qt::CaseInsensitive)<0); } diff --git a/x2goclient2.pro b/x2goclient2.pro index 96a814f..59167ba 100755 --- a/x2goclient2.pro +++ b/x2goclient2.pro @@ -28,6 +28,8 @@ FORMS += mainwindow.ui \ messagebox.ui \ helpdialog.ui \ sessionstatusframe.ui \ + sessionstatusframestatus.ui \ + sessionstatusframeapplications.ui \ profile.ui SOURCES += main.cpp \ @@ -60,6 +62,8 @@ SOURCES += main.cpp \ sshconnectionguiinteraction.cpp \ sshprocess.cpp \ sessionstatusframe.cpp \ + sessionstatusframestatus.cpp \ + sessionstatusframeapplications.cpp \ profile.cpp HEADERS += mainwindow.h \ @@ -91,6 +95,8 @@ HEADERS += mainwindow.h \ sshconnectionguiinteraction.h \ sshprocess.h \ sessionstatusframe.h \ + sessionstatusframestatus.h \ + sessionstatusframeapplications.h \ profile.h LIBS += -lssh hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).

1 0

python-wsgilog.git - squeeze-backports (branch) updated: debian/0.3-1-2-gafb2707
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, squeeze-backports has been updated via afb2707c64ce87f9bf33c0c817ee9f1d84dc3bb1 (commit) from 2e950b1af269745e27582a4481781a12b154bfc1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit afb2707c64ce87f9bf33c0c817ee9f1d84dc3bb1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:45:03 2013 +0100 reduce compat level to 7 ----------------------------------------------------------------------- Summary of changes: debian/compat | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/compat b/debian/compat index f11c82a..c793025 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +7 \ No newline at end of file diff --git a/debian/control b/debian/control index 5fc8a39..e2de3a7 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Build-Depends: cdbs (>= 0.4.89~), - debhelper (>= 7), + debhelper (>= 7.0.50~), python (>= 2.6.6-3~), python-setuptools, Standards-Version: 3.9.4 hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-wsgilog.git" (Debian package python-wsgilog).

1 0

python-wsgilog.git - squeeze-backports (branch) created: debian/0.3-1-1-g2e950b1
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, squeeze-backports has been created at 2e950b1af269745e27582a4481781a12b154bfc1 (commit) - Log ----------------------------------------------------------------- commit 2e950b1af269745e27582a4481781a12b154bfc1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:43:18 2013 +0100 Backport to squeeze. ----------------------------------------------------------------------- hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-wsgilog.git" (Debian package python-wsgilog).

1 0

python-wsgilog.git - pristine-tar (branch) created: 43a9388f0d46290c8f97b6da9d5a03c637f67d04
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, pristine-tar has been created at 43a9388f0d46290c8f97b6da9d5a03c637f67d04 (commit) - Log ----------------------------------------------------------------- commit 43a9388f0d46290c8f97b6da9d5a03c637f67d04 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Feb 18 11:37:39 2013 +0100 pristine-tar data for python-wsgilog_0.3.orig.tar.gz ----------------------------------------------------------------------- hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-wsgilog.git" (Debian package python-wsgilog).

1 0

python-wsgilog.git - upstream (branch) created: 086aa63bbd142d238800fa8fd4ca8b8d27df4d6e
by git-admin＠x2go.org 18 Feb '13

18 Feb '13

The branch, upstream has been created at 086aa63bbd142d238800fa8fd4ca8b8d27df4d6e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- python-wsgilog.git (Debian package python-wsgilog) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-wsgilog.git" (Debian package python-wsgilog).

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits February 2013