Merge pull request #32 from jtanx/master

Add FCGI request parsing helper

diff --git a/irc/log b/irc/log
index 76a2601..de5919d 100644 (file)
--- a/irc/log
+++ b/irc/log
@@ -2011,3 +2011,60 @@
 21:47 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
 22:36 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
 22:38 -!- Callum [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+--- Day changed Mon Sep 09 2013
+09:50 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+09:59 -!- jtanx_ [[email protected]] has joined #mctxuwa_softdev
+10:13 -!- jtanx [[email protected]] has quit [Ping timeout]
+10:54 -!- jtanx_ [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+11:30 -!- Irssi: #mctxuwa_softdev: Total of 2 nicks [0 ops, 0 halfops, 0 voices, 2 normal]
+13:27 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+13:48 -!- jtanx [[email protected]] has quit [Ping timeout]
+14:07 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+15:25 -!- jtanx [[email protected]] has quit [Ping timeout]
+15:53 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+15:55 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+20:33 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+21:01 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+--- Day changed Tue Sep 10 2013
+17:16 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+17:25 < jtanx> it looks like we do need an sd card, at least to install the os onto it
+17:26 < jtanx> http://beagleboard.org/Getting%20Started#update
+17:41 < jtanx> http://avedo.net/653/flashing-ubuntu-13-04-or-debian-wheezy-to-the-beaglebone-black-emmc/
+17:42 < sam_moore> Ok, we should write a BOM for next week then
+17:42 < sam_moore> 1x SD Card
+17:44 < jtanx> from what I understand
+17:45 < jtanx> you write an image to the sd card
+17:45 < jtanx> boot off the sd card
+17:45 < jtanx> then you can write another image directly too the internal storage
+17:45 < jtanx> after that you don't need the sd card any more
+17:46 < sam_moore> Alright
+17:46 < jtanx> http://www.armhf.com/index.php/boards/beaglebone-black/
+17:47 < jtanx> any preference for ubuntu or debian?
+17:48 < sam_moore> As a debian user, I'd have to say debian :P
+17:49 < jtanx> hehe
+17:49 < sam_moore> If it works on debian stable, we know it will work for at least the next 6 years
+17:49 < jtanx> yup
+17:49 < jtanx> debian should be fine
+17:53 < jtanx> *correction; we need a microsd card
+17:56 < jtanx> that's at least 2GB in size
+17:57 < sam_moore> Ok
+18:04 < jtanx> haha it's cheaper to buy a 4gb one than a 2gb one
+18:35 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+19:11 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+20:15 < jtanx> Well I can confirm that angstrom doesn't have nginx precompiled - http://www.angstrom-distribution.org/repo/
+20:57 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+--- Day changed Wed Sep 11 2013
+10:41 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+11:10 -!- jtanx [[email protected]] has quit [Ping timeout]
+15:58 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+15:58 < jtanx> urgh
+15:58 < jtanx> it took so long just getting internet access to the bbb
+16:01 < jtanx> dhcp/dns issues
+16:01 < jtanx> the debian image on the microsd is set to static ip 192.168.0.7
+16:02 < jtanx>  /etc/resolv.conf should have the uwa nameservers in it, but it may have been rewritten by resolvconf
+16:02 < jtanx> I've left it in g19
+16:51 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]
+17:41 -!- jtanx [[email protected]] has joined #mctxuwa_softdev
+19:32 < jtanx> I've moved the 'current_time', 'start_time' and 'running_time' to the identify module instead of sticking it on every json response, because it's probably not information that will be required most of the time
+19:37 < jtanx> actually, we may have to rethink those, especially if we introduce start/stop control
+20:38 -!- jtanx [[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 23.0.1/20130814063812]"]

diff --git a/server/Makefile b/server/Makefile
index 72d37de..b674ab0 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -6,12 +6,12 @@ OBJ = log.o control.o sensor.o fastcgi.o thread.o main.o
 RM = rm -f
 
 BIN = server
-BIN2 = stream
+#BIN2 = stream
 
 all : $(BIN) $(BIN2)
 
-stream : stream.c
-       $(CXX) -o stream stream.c -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lm
+#stream : stream.c
+#      $(CXX) -o stream stream.c -I/usr/include/opencv -I/usr/include/opencv2/highgui -L/usr/lib -lopencv_highgui -lopencv_core -lopencv_ml -lopencv_imgproc -lm
 
 
 $(BIN) : $(OBJ)

diff --git a/server/run.sh b/server/run.sh
index a776cbd..aafc5d1 100755 (executable)
--- a/server/run.sh
+++ b/server/run.sh
@@ -2,5 +2,5 @@
 # Use this to quickly test run the server in valgrind
 #spawn-fcgi -p9005 -n ./valgrind.sh
 # Use this to run the server normally
-./stream &
+#./stream &
 spawn-fcgi -p9005 -n ./server