Attachment 7532 Details for Bug 40894 – patch

[patch] patch

40894.patch (text/plain), 2.83 KB, created by Florian Best on 2016-03-14 09:28:07 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-03-14 09:28:07 CET

Size: 2.83 KB

patch

obsolete

>diff --git a/management/univention-management-console/scripts/univention-management-console-module b/management/univention-management-console/scripts/univention-management-console-module
>index 83edef8..85ff865 100644
>--- a/management/univention-management-console/scripts/univention-management-console-module
>+++ b/management/univention-management-console/scripts/univention-management-console-module
>@@ -67,15 +67,17 @@ if __name__ == '__main__':
> 	default_debug = MODULE_DEBUG_LEVEL
> 	parser.add_option( '-d', '--debug', action = 'store', type = 'int', dest = 'debug', default = default_debug,
> 					   help = 'if given then debugging is activated and set to the specified level [default: %default]' )
>-	parser.add_option( '-L', '--log-file', action = 'store',  dest = 'logfile', default = 'management-console-module', help = 'specifies an alternative log file [default: %default-<module name>.log]' )
>+	parser.add_option( '-L', '--log-file', action = 'store',  dest = 'logfile', default = 'management-console-module-%(module)s', help = 'specifies an alternative log file [default: %default-<module name>.log]' )
>+	parser.add_option('-f', '--foreground', action='store_true', dest='foreground', default=False, help='do not daemonize the process')
> 
> 	( options, arguments ) = parser.parse_args()
> 
>-	daemon = DaemonContext(detach_process=False, prevent_core=False, umask=0077)
>-	daemon.signal_map = {
>-		signal.SIGHUP: lambda signal, frame: log_reopen(),
>-	}
>-	daemon.open()
>+	if not options.foreground:
>+		daemon = DaemonContext(detach_process=False, prevent_core=False, umask=0077)
>+		daemon.signal_map = {
>+			signal.SIGHUP: lambda signal, frame: log_reopen(),
>+		}
>+		daemon.open()
> 
> 	# MUST be called after initializing the deamon
> 	if options.notifier.lower() == 'generic':
>@@ -86,7 +88,7 @@ if __name__ == '__main__':
> 		notifier.init( notifier.QT )
> 
> 	# init logging
>-	debug_fd = log_init( '%s-%s' % ( options.logfile, options.module ), options.debug )
>+	debug_fd = log_init(options.logfile % {'module': options.module}, options.debug )
> 	# no notifier logging
> 	nflog.instance.handlers = []
> 	# to activate notifier logging
>diff --git a/management/univention-management-console/src/univention/management/console/protocol/server.py b/management/univention-management-console/src/univention/management/console/protocol/server.py
>index 9f4adf4..2e85af0 100644
>--- a/management/univention-management-console/src/univention/management/console/protocol/server.py
>+++ b/management/univention-management-console/src/univention/management/console/protocol/server.py
>@@ -383,6 +383,7 @@ def __init__(self, port=6670, ssl=True, unix=None, magic=True, magicClass=MagicB
> 	def __del__(self):
> 		if self.__bucket:
> 			del self.__bucket
>+			self.__bucket = None
> 
> 	def __verify_cert_cb(self, conn, cert, errnum, depth, ok):
> 		CORE.info('__verify_cert_cb: Got certificate: %s' % cert.get_subject())

Actions: View | Diff

Attachments on bug 40894: 7532