Changeset 7017

Timestamp:

06/08/16 14:42:45 (8 years ago)

Author:

Leif-Jöran

Message:

Aligning configuration files for rpm deployment and production. Avoid NPE on configuration options not being used.

Location:

SRUAggregator/trunk/src

Files:

• assembly/conf/aggregator.yaml (modified) (2 diffs)
• main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (1 diff)

SRUAggregator/trunk/src/assembly/conf/aggregator.yaml

@@ -1 +1 @@
 aggregatorParams:
-  CENTER_REGISTRY_URL: http://centres.clarin.eu/restxml/
+  CENTER_REGISTRY_URL: https://centres.clarin.eu/restxml/
 #  additionalCQLEndpoints:
 #    # - https://clarin.ids-mannheim.de/digibibsru-new
@@ -14 +14 @@
   AGGREGATOR_FILE_PATH: /var/lib/aggregator/fcsAggregatorCorpora.json
   AGGREGATOR_FILE_PATH_BACKUP: /var/lib/aggregator/fcsAggregatorCorpora.backup.json
-  # AGGREGATOR_FILE_PATH: /Users/edima/fcsAggregatorCorpora.json
-  # AGGREGATOR_FILE_PATH_BACKUP: /Users/edima/fcsAggregatorCorpora.backup.json
+
   SCAN_MAX_DEPTH: 3 # recommended 3
-  SCAN_TASK_INITIAL_DELAY: 0
-  SCAN_TASK_INTERVAL: 12
+  SCAN_TASK_INITIAL_DELAY: 10
+  SCAN_TASK_INTERVAL: 24
   SCAN_TASK_TIME_UNIT: HOURS
+  SCAN_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4  # @depth2: 1=361s; 2=225s; 4=207s
 
-  SCAN_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4  # @depth2: 1=361s; 2=225s; 4=207s
   SEARCH_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4
+  SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT: 1
+  slowEndpoints:
+    - http://cqlservlet.mpi.nl/
 
-  ENDPOINTS_SCAN_TIMEOUT_MS: 60000
+  ENDPOINTS_SCAN_TIMEOUT_MS: 600000 # 10 minutes, needed for slow BAS server
   ENDPOINTS_SEARCH_TIMEOUT_MS: 30000
   EXECUTOR_SHUTDOWN_TIMEOUT_MS: 1000
 
   weblichtConfig:
-    url: https://weblicht.sfs.uni-tuebingen.de/webLicht/?input=
+    url: https://weblicht.sfs.uni-tuebingen.de/weblicht/?input=
     acceptedTcfLanguages:
       - en

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -225 +225 @@
                         @Override
                         public int getMaxConcurrentRequest(URI baseURI) {
-                                return params.slowEndpoints.contains(baseURI)
+                                return (params.slowEndpoints != null && params.slowEndpoints.contains(baseURI))
                                                 ? params.SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT
                                                 : params.SEARCH_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT;