From 0a0beb74008c3b6a7e21dad0d38121276f2d1867 Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 23 Jun 2015 20:02:38 +0000
Subject: [PATCH] configuration chages related to file processing and retries

---
 etc/daq-web-service.conf.template |  7 +++++--
 etc/ds-web-service.conf.template  | 10 +++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/etc/daq-web-service.conf.template b/etc/daq-web-service.conf.template
index d23d1a5c..a0f94ed8 100644
--- a/etc/daq-web-service.conf.template
+++ b/etc/daq-web-service.conf.template
@@ -18,8 +18,11 @@ minFileProcessingDelayInSeconds=10
 fileSystemEventTimeoutInSeconds=10
 
 [FileProcessingManager]
-nProcessingThreads=3
-fileProcessor1=dm.common.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin()
+numberOfProcessingThreads=3
+defaultNumberOfRetries=3
+defaultRetryWaitPeriodInSeconds=60
+fileProcessor1=dm.common.processing.plugins.rsyncFileTransferPlugin.RsyncFileTransferPlugin()
+fileProcessor2=dm.daq_web_service.service.impl.dsProcessFileNotificationPlugin.DsProcessFileNotificationPlugin()
 
 [DsRestApiFactory]
 username=DM_SYSTEM_USER
diff --git a/etc/ds-web-service.conf.template b/etc/ds-web-service.conf.template
index 5c0a0c66..1463758b 100644
--- a/etc/ds-web-service.conf.template
+++ b/etc/ds-web-service.conf.template
@@ -11,14 +11,22 @@ principalRetriever=DbPrincipalRetriever()
 principalAuthenticator1=CryptedPasswordPrincipalAuthenticator()
 principalAuthenticator2=LdapPasswordPrincipalAuthenticator(serverUrl='ldaps://phoebusldap.aps.anl.gov:636', dnFormat='uid=%s,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov')
 
-[StorageManager]
+[ExperimentManager]
 storageDirectory=DM_STORAGE_DIR
+manageStoragePermissions=True
+platformUtility=dm.common.utility.linuxUtility.LinuxUtility()
 
 [DbManager]
 dbSchema=DM_DB_NAME
 dbUser=DM_DB_NAME
 dbPasswordFile=DM_INSTALL_DIR/etc/DM_DB_NAME.db.passwd
 
+[FileProcessingManager]
+numberOfProcessingThreads=3
+defaultNumberOfRetries=3
+defaultRetryWaitPeriodInSeconds=60
+#fileProcessor1=
+
 # Available logger levels: debug, info, warn, error, critical
 [ConsoleLogging]
 handler=ConsoleLoggingHandler(sys.stdout,)
-- 
GitLab