Author: lslezak Date: Thu Feb 12 10:39:45 2009 New Revision: 55453 URL: http://svn.opensuse.org/viewcvs/yast?rev=55453&view=rev Log: - DBus service - increased shutdown timeout to 2 minutes Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc?rev=55453&r1=55452&r2=55453&view=diff ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Thu Feb 12 10:39:45 2009 @@ -13,11 +13,11 @@ #include // timeout for reading a DBus message (in miliseconds) -#define DBUS_TIMEOUT_VALUE 15000 +#define YAST_DBUS_TIMEOUT_VALUE 15000 // the count of timeout events before exiting -#define DBUS_TIMEOUT_COUNT 2 +#define YAST_DBUS_SHUTDOWN_TIMEOUT_COUNT 8 -int timeout_counter = DBUS_TIMEOUT_COUNT; +int timeout_counter = YAST_DBUS_SHUTDOWN_TIMEOUT_COUNT; DBusServerBase::DBusServerBase() { @@ -125,7 +125,7 @@ // the time is over if (!timeout_counter) { - y2milestone("Timout reached"); + y2debug("Timout reached"); if (canFinish()) { @@ -134,7 +134,7 @@ else { // reset the flag - timeout_counter = DBUS_TIMEOUT_COUNT; + timeout_counter = YAST_DBUS_SHUTDOWN_TIMEOUT_COUNT; } } @@ -145,7 +145,7 @@ if (request.empty()) { // wait for a DBus message - connection.setTimeout(DBUS_TIMEOUT_VALUE); + connection.setTimeout(YAST_DBUS_TIMEOUT_VALUE); // decrease the timeout counter if (! forever) Modified: branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc?rev=55453&r1=55452&r2=55453&view=diff ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc Thu Feb 12 10:39:45 2009 @@ -56,6 +56,8 @@ PolKitResult pk_result = polkit_context_is_caller_authorized( context, pk_action, pk_caller, TRUE, &polkit_error); + y2debug("polkit_context_is_caller_authorized() result: %s", polkit_result_to_string_representation(pk_result)); + polkit_action_unref (pk_action); if (polkit_error) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org