# HG changeset patch # User KUBOTA Yuji # Date 1489105899 -32400 # Node ID 5c6af4ec5c406d4fe3a3069956ee63ab24f9ed8b # Parent 9db2ed159a6f065b8c0c1f0e2c92d479ce836feb Bug 3338: Make reloadable option as same as the latest version Reviewed-by: yasuenag diff -r 9db2ed159a6f -r 5c6af4ec5c40 agent/ChangeLog --- a/agent/ChangeLog Fri Mar 10 01:11:20 2017 +0900 +++ b/agent/ChangeLog Fri Mar 10 09:31:39 2017 +0900 @@ -1,6 +1,7 @@ 2017-03-10 KUBOTA Yuji * Bug 3223: Cannot set empty value to signal setting + * Bug 3338: Make reloadable option as same as the latest version 2017-01-16 Yasumasa Suenaga diff -r 9db2ed159a6f -r 5c6af4ec5c40 agent/src/util.cpp --- a/agent/src/util.cpp Fri Mar 10 01:11:20 2017 +0900 +++ b/agent/src/util.cpp Fri Mar 10 09:31:39 2017 +0900 @@ -221,8 +221,6 @@ newArg->triggerOnLogError &= oldArg->triggerOnLogError; newArg->triggerOnLogSignal = oldArg->triggerOnLogSignal; newArg->triggerOnLogLock = oldArg->triggerOnLogLock; - newArg->TimerInterval = oldArg->TimerInterval; - newArg->LogInterval = oldArg->LogInterval; newArg->logSignalNormal = oldArg->logSignalNormal; newArg->logSignalAll = oldArg->logSignalAll; newArg->reloadSignal = oldArg->reloadSignal;