diff --git a/ATxCommon/Serializables/ServiceConfig.cs b/ATxCommon/Serializables/ServiceConfig.cs index 5cd3d90c6c45654d9f807b06444cb6684ae69a1f..1414f50bb1acd0fb559eb95dcd78ea88b828166a 100644 --- a/ATxCommon/Serializables/ServiceConfig.cs +++ b/ATxCommon/Serializables/ServiceConfig.cs @@ -57,11 +57,6 @@ namespace ATxCommon.Serializables /// </summary> public string TmpTransferDir { get; set; } - /// <summary> - /// The interval (in ms) for checking for new files and system parameters. - /// </summary> - public int ServiceTimer { get; set; } - /// <summary> /// Maximum allowed CPU usage across all cores in percent. Running transfers will be paused /// if this limit is exceeded. @@ -83,6 +78,11 @@ namespace ATxCommon.Serializables /// </summary> public bool Debug { get; set; } = false; + /// <summary> + /// The interval (in ms) for checking for new files and system parameters. Default: 1000. + /// </summary> + public int ServiceTimer { get; set; } = 1000; + /// <summary> /// The name of a marker file to be placed in all **sub**directories /// inside the IncomingDirectory. diff --git a/Resources/conf/config.common.xml b/Resources/conf/config.common.xml index c985d944580577de54a1405ef1a48bd12134307d..eba6f5aa6a58ed5eb0faad5437568dbab4c4ed62 100644 --- a/Resources/conf/config.common.xml +++ b/Resources/conf/config.common.xml @@ -21,9 +21,6 @@ to be used for running transfers --> <TmpTransferDir>d-vamp-dw</TmpTransferDir> - <!-- ServiceTimer: interval (in ms) for checking files and parameters --> - <ServiceTimer>1000</ServiceTimer> - <!-- MaxCpuUsage: pause transfer if CPU usage is above this value (in %)--> <MaxCpuUsage>25</MaxCpuUsage> @@ -36,6 +33,9 @@ <!-- Debug: enable or disable debug log messages --> <Debug>true</Debug> + <!-- ServiceTimer: interval (in ms) for checking files and parameters --> + <ServiceTimer>1000</ServiceTimer> + <!-- MarkerFile: a file to place in each user's incoming directory, the file itself will be ignored for the transfers --> <MarkerFile>_DO_NOT_ACQUIRE_HERE_.txt</MarkerFile>