[tor-commits] [metrics-tasks/master] Tweak code for web logs analysis (#20008).

[karsten at torproject.org]

commit f4f909d227732fe3ba14da17436e3fc3065f70f4
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sun Aug 28 14:38:02 2016 +0200

    Tweak code for web logs analysis (#20008).
---
 task-20008/run.sh       | 2 +-
 task-20008/webstats.sql | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/task-20008/run.sh b/task-20008/run.sh
index 4039ee6..883b0c3 100755
--- a/task-20008/run.sh
+++ b/task-20008/run.sh
@@ -3,6 +3,6 @@ date
 rm -rf bin
 mkdir -p bin/
 javac -d bin/ -cp lib/commons-compress-1.9.jar:lib/postgresql-jdbc3-9.2.jar:lib/xz-1.5.jar src/Importer.java
-java -cp bin:lib/commons-compress-1.9.jar:lib/postgresql-jdbc3-9.2.jar:lib/xz-1.5.jar Importer webstats.torproject.org >> log
+java -cp bin:lib/commons-compress-1.9.jar:lib/postgresql-jdbc3-9.2.jar:lib/xz-1.5.jar Importer webstats.torproject.org >> log 2>&1
 date
 
diff --git a/task-20008/webstats.sql b/task-20008/webstats.sql
index 91a36b6..079397d 100644
--- a/task-20008/webstats.sql
+++ b/task-20008/webstats.sql
@@ -17,9 +17,9 @@ CREATE TABLE resources (
 );
 
 CREATE TABLE requests (
-  file_id integer REFERENCES files (file_id),
+  file_id integer REFERENCES files (file_id) NOT NULL,
   method method NOT NULL,
-  resource_id integer REFERENCES resources (resource_id),
+  resource_id integer REFERENCES resources (resource_id) NOT NULL,
   response_code smallint NOT NULL,
   count integer NOT NULL,
   total_bytes_sent bigint NOT NULL,