colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dispatcher: bump script timeout up to 20 seconds (rh #1048345)

Browse Source 
The dispatcher would kill scripts after 3 seconds, but on
heavily-loaded machines, that was sometimes too short even for simple
scripts. Bump the timeout up to 20 seconds instead (and change the
10-second quit-on-idle timer to not run when a script is running).

Also change the D-Bus call timeout in the daemon to 30 seconds, so
that it only triggers if something goes really wrong and the action
timeout fails.
This commit is contained in:
Dan Winship
2014-03-31 08:38:06 -04:00
parent 1796aae751
commit d9334503d7
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nm-dispatcher.c
View File

@@ -342,7 +342,7 @@ _dispatcher_call (DispatcherAction action,
dispatcher_done_cb,
info,
(GDestroyNotify) dispatcher_info_free,
15000,
30000,
G_TYPE_STRING, action_to_string (action),
DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT, connection_hash,
DBUS_TYPE_G_MAP_OF_VARIANT, connection_props,