Fully embrace foreman now :)

tackley · Nov 3, 2011 · 070a15c · 070a15c
1 parent b9c0fb3
commit 070a15c
Show file tree

Hide file tree

Showing 35 changed files with 27 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-/Procfile~
+*~
+target/
+.idea*/
diff --git a/Procfile b/Procfile
@@ -1,4 +1,6 @@
-listenerguweb01: ./start_pub.sh
-listenerguweb51: ./start_pub2.sh
-webapp: ./start_app.sh
+webapp: ./sbt run
+listenerguweb01: ./start_pub.sh guweb01
+listenerguweb51: ./start_pub.sh guweb51
+
+
 
diff --git a/dashboard/build.sbt → build.sbt b/dashboard/build.sbt → build.sbt
diff --git a/dashboard/.gitignore b/dashboard/.gitignore
diff --git a/dashboard/readme.md b/dashboard/readme.md
diff --git a/dashboard/project/build.properties → project/build.properties b/dashboard/project/build.properties → project/build.properties
diff --git a/dashboard/project/plugins.sbt → project/plugins.sbt b/dashboard/project/plugins.sbt → project/plugins.sbt
diff --git a/publisher.rb b/publisher.rb
@@ -3,12 +3,21 @@
 require 'rubygems'
 require 'zmq'
 
+unless ARGV.length == 1
+  puts "usage: publisher.rb port"
+  exit
+end
+
+port = ARGV[0]
+
+puts "Publishing on port #{port}..."
+
 context = ZMQ::Context.new(1)
 publisher = context.socket(ZMQ::PUB)
 publisher.setsockopt(ZMQ::HWM, 10);
-publisher.bind("tcp://*:5536")
+publisher.bind("tcp://*:#{port}")
 
-ARGF.each_line do |l|
+STDIN.each_line do |l|
   publisher.send(l)
 end
 
diff --git a/publisher2.rb b/publisher2.rb
diff --git a/...c/main/scala/bootstrap/liftweb/Boot.scala → src/main/scala/bootstrap/liftweb/Boot.scala b/...c/main/scala/bootstrap/liftweb/Boot.scala → src/main/scala/bootstrap/liftweb/Boot.scala
diff --git a/...scala/dashboard/comet/TopHitsServer.scala → ...scala/dashboard/comet/TopHitsServer.scala b/...scala/dashboard/comet/TopHitsServer.scala → ...scala/dashboard/comet/TopHitsServer.scala
diff --git a/...rc/main/scala/dashboard/lib/Backend.scala → src/main/scala/dashboard/lib/Backend.scala b/...rc/main/scala/dashboard/lib/Backend.scala → src/main/scala/dashboard/lib/Backend.scala
diff --git a/...main/scala/dashboard/lib/Calculator.scala → ...main/scala/dashboard/lib/Calculator.scala b/...main/scala/dashboard/lib/Calculator.scala → ...main/scala/dashboard/lib/Calculator.scala
diff --git a/.../src/main/scala/dashboard/lib/Event.scala → src/main/scala/dashboard/lib/Event.scala b/.../src/main/scala/dashboard/lib/Event.scala → src/main/scala/dashboard/lib/Event.scala
diff --git a/...n/scala/dashboard/lib/EventListener.scala → ...n/scala/dashboard/lib/EventListener.scala b/...n/scala/dashboard/lib/EventListener.scala → ...n/scala/dashboard/lib/EventListener.scala
diff --git a/...c/main/scala/dashboard/lib/MqReader.scala → src/main/scala/dashboard/lib/MqReader.scala b/...c/main/scala/dashboard/lib/MqReader.scala → src/main/scala/dashboard/lib/MqReader.scala
@@ -18,8 +18,8 @@ class MqReader(actor: ActorRef) {
     val context = ZMQ.context(1)
     val sub = context.socket(ZMQ.SUB)
 
-    sub.connect("tcp://localhost:5536")
-    sub.connect("tcp://localhost:5537")
+    sub.connect("tcp://localhost:5100")
+    sub.connect("tcp://localhost:5200")
     sub.subscribe(Array.empty)
     sub.setHWM(50)
 

diff --git a/...rc/main/scala/dashboard/lib/TopHits.scala → src/main/scala/dashboard/lib/TopHits.scala b/...rc/main/scala/dashboard/lib/TopHits.scala → src/main/scala/dashboard/lib/TopHits.scala
diff --git a/...ain/scala/dashboard/snippet/DataAge.scala → ...ain/scala/dashboard/snippet/DataAge.scala b/...ain/scala/dashboard/snippet/DataAge.scala → ...ain/scala/dashboard/snippet/DataAge.scala
diff --git a/...main/scala/dashboard/snippet/Detail.scala → ...main/scala/dashboard/snippet/Detail.scala b/...main/scala/dashboard/snippet/Detail.scala → ...main/scala/dashboard/snippet/Detail.scala
diff --git a/dashboard/src/main/webapp/WEB-INF/web.xml → src/main/webapp/WEB-INF/web.xml b/dashboard/src/main/webapp/WEB-INF/web.xml → src/main/webapp/WEB-INF/web.xml
diff --git a/...d/src/main/webapp/arrow-3D-green-down.jpg → src/main/webapp/arrow-3D-green-down.jpg b/...d/src/main/webapp/arrow-3D-green-down.jpg → src/main/webapp/arrow-3D-green-down.jpg
diff --git a/dashboard/src/main/webapp/details.html → src/main/webapp/details.html b/dashboard/src/main/webapp/details.html → src/main/webapp/details.html
diff --git a/...board/src/main/webapp/down_arrow_icon.png → src/main/webapp/down_arrow_icon.png b/...board/src/main/webapp/down_arrow_icon.png → src/main/webapp/down_arrow_icon.png
diff --git a/dashboard/src/main/webapp/gdn.gif → src/main/webapp/gdn.gif b/dashboard/src/main/webapp/gdn.gif → src/main/webapp/gdn.gif
diff --git a/dashboard/src/main/webapp/index.html → src/main/webapp/index.html b/dashboard/src/main/webapp/index.html → src/main/webapp/index.html
diff --git a/dashboard/src/main/webapp/new_entry_icon.png → src/main/webapp/new_entry_icon.png b/dashboard/src/main/webapp/new_entry_icon.png → src/main/webapp/new_entry_icon.png
diff --git a/...ain/webapp/static/bootstrap-1.3.0.min.css → ...ain/webapp/static/bootstrap-1.3.0.min.css b/...ain/webapp/static/bootstrap-1.3.0.min.css → ...ain/webapp/static/bootstrap-1.3.0.min.css
diff --git a/dashboard/src/main/webapp/static/stats.css → src/main/webapp/static/stats.css b/dashboard/src/main/webapp/static/stats.css → src/main/webapp/static/stats.css
diff --git a/dashboard/src/main/webapp/top10.html → src/main/webapp/top10.html b/dashboard/src/main/webapp/top10.html → src/main/webapp/top10.html
diff --git a/dashboard/src/main/webapp/top20.html → src/main/webapp/top20.html b/dashboard/src/main/webapp/top20.html → src/main/webapp/top20.html
diff --git a/dashboard/src/main/webapp/up_arrow_icon.png → src/main/webapp/up_arrow_icon.png b/dashboard/src/main/webapp/up_arrow_icon.png → src/main/webapp/up_arrow_icon.png
diff --git a/...src/test/scala/dashboard/ZeroMqTest.scala → src/test/scala/dashboard/ZeroMqTest.scala b/...src/test/scala/dashboard/ZeroMqTest.scala → src/test/scala/dashboard/ZeroMqTest.scala
diff --git a/start_app.sh b/start_app.sh
diff --git a/start_pub.sh b/start_pub.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
-ssh devsuprt@guweb01 "nice tail -f /apache2/logs/guardian-access_log" | ./publisher.rb
+SERVER=$1
+PORT=${PORT:-5100}
+
+echo "Connecting to server $SERVER, republishing on port $PORT"
+
+ssh devsuprt@$SERVER "nice tail -f /apache2/logs/guardian-access_log" | ./publisher.rb $PORT
 
diff --git a/start_pub2.sh b/start_pub2.sh