projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 88d2634)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorJohn Malconian <malc@indexdata.com>
Mon, 22 Sep 2014 13:03:22 +0000 (13:03 +0000)
committerJohn Malconian <malc@indexdata.com>
Mon, 22 Sep 2014 13:03:22 +0000 (13:03 +0000)
Makefile patch | blob | history
examples/htdocs/mike.html patch | blob | history
test/.gitignore patch | blob | history
test/bin/bomb.pl patch | blob | history
tools/apache2/jasmine-dev.template patch | blob | history

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/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 61b3991..2419ac5 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -2,6 +2,11 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>MKWS demo</title>
+    <script type="text/javascript">
+      var mkws_config = {
+//        pp2_hostname: "x.sp-mkws.indexdata.com",
+      };
+    </script>
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
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
MasterKey Widget Set