Merge branch 'master' into templateallthemarkup

diff --git a/Makefile b/Makefile
index dc14855..ebcb40d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,4 +25,5 @@ check: setup check-js phantomjs
 help:
        @echo "make [ all | setup | clean | distclean ]"
        @echo "     [ check | check-js | phantomjs ]"
+       @echo "If 'make check' timeout is too short, extend with: make check PHANTOMJS_TIMEOUT=40"
 

diff --git a/test/.gitignore b/test/.gitignore
index dd1c75a..dc05163 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,7 +1,8 @@
-node_modules
+libexec
 logs/error_log
 logs/jasmine-dev
 logs/mkws-jasmine-access.log
 logs/mkws-jasmine-error.log
 logs/mkws-jasmine-rewrite.log
 logs/mkws-jasmine.pid
+node_modules

diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl
index a79be99..95e7dd5 100755 (executable)
--- a/test/bin/bomb.pl
+++ b/test/bin/bomb.pl
@@ -45,7 +45,7 @@ eval {
     BSD::Resource::setrlimit("RLIMIT_CPU", $timeout, 2*$timeout) or die "Cannot set CPU limit: $!\n";
 };
 if ($@) {
-    warn "Please install the package BSD::Resource!\n\n$@\n";
+    warn "WARNING: things would go more nicely with the BSD::Resource package\n";
 }
 
 

diff --git a/tools/apache2/jasmine-dev.template b/tools/apache2/jasmine-dev.template
index acf7cf4..92e22cb 100644 (file)
--- a/tools/apache2/jasmine-dev.template
+++ b/tools/apache2/jasmine-dev.template
@@ -16,7 +16,9 @@ Listen ${APACHE_PORT}
 Include ${APACHE_MODULES}
 
 <IfModule log_config_module>
-   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+   # %O only works if mod_logio is enabled, which it isn't on Mike's MacBook
+   # LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+   LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s \"%{Referer}i\" \"%{User-Agent}i\"" combined
 </IfModule>
 
 # pazpar2 / service proxy config

diff --git a/tools/apache2/sp-mkws-live b/tools/apache2/sp-mkws-live
index bcd9e81..f335d96 100644 (file)
--- a/tools/apache2/sp-mkws-live
+++ b/tools/apache2/sp-mkws-live
@@ -19,12 +19,8 @@
     Header set Access-Control-Allow-Credentials true
 
     ProxyPreserveHost On
-    # We could use any of the following:
-    #  sp-mkc.indexdata.com/service-proxy/ -- multiplexer
-    #  sp-mkc-sansa.indexdata.com:8080/service-proxy/ -- 1st back-end server
-    #  sp-mkc-arya.indexdata.com:8080/service-proxy/ -- 2nd back-end server
-    ProxyPass        /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
-    ProxyPassReverse /service-proxy/ http://sp-mkc-sansa.indexdata.com:8080/service-proxy/
+    ProxyPass        /service-proxy/ http://sp-mkws-backend.indexdata.com:8080/service-proxy/
+    ProxyPassReverse /service-proxy/ http://sp-mkws-backend.indexdata.com:8080/service-proxy/
 
     PerlOptions +Parent
     PerlSwitches -I/home/indexdata/mkws/tools/mod_perl

diff --git a/tools/service-proxy/service-proxy.properties b/tools/service-proxy/service-proxy.properties
index 1c67a04..a3b92e4 100644 (file)
--- a/tools/service-proxy/service-proxy.properties
+++ b/tools/service-proxy/service-proxy.properties
@@ -6,6 +6,7 @@ plugins.relay      = com.indexdata.serviceproxy.plugins.Pazpar2RelayPlugin
 plugins.authn      = com.indexdata.serviceproxy.plugins.AuthNTorusPlugin
 plugins.categories = com.indexdata.serviceproxy.plugins.TargetCategoriesPlugin
 plugins.ils        = com.indexdata.serviceproxy.plugins.ILSPlugin
+plugins.statistics = com.indexdata.serviceproxy.plugins.StatisticsPlugin
 
 
 # Configuration properties for individual plug-ins 
@@ -41,7 +42,7 @@ chains.auth = authn
 chains.categories = categories
 chains.ils = ils
 # Map all other commands to the Pazpar2 relayer
-chains.* = relay
+chains.* = relay,statistics
 
 
 # Just so I can check that this particular SP config is in use