Merge pull request #1 from ICTD-Maroubra/add-tinyb

Add Tinyb

Dockerfile

@@ -0,0 +1,10 @@
+FROM openjdk:8
+
+ADD ./docker-entrypoint.sh /
+COPY ./pems-server/build/libs/pems-all.jar /pems/
+COPY ./pems-server/lib/tinyb/* /pems/
+
+RUN apt-get update && \
+    apt-get install -q -y bluez
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]

docker-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cd /pems
+
+service dbus start
+service dbus status
+
+service bluetooth restart
+
+java -Djava.library.path=/pems/ -jar pems-all.jar

pems-server/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'application'
+    id 'com.github.johnrengelman.shadow' version '2.0.1'
 }
 
 group 'org.maroubra'
@@ -19,6 +20,10 @@ jar {
     }
 }
 
+shadowJar {
+    archiveName 'pems-all.jar'
+}
+
 dependencies {
     compile 'org.slf4j:slf4j-log4j12:1.7.25'
 
@@ -43,9 +48,15 @@ dependencies {
 
     compile 'com.github.joschi:jadconfig:0.13.0'
 
+    compile files('lib/tinyb/tinyb-0.5.0-23.jar')
+
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
 tasks.withType(JavaCompile) {
     options.compilerArgs << '-parameters'
-}
+}
+
+tasks.withType(JavaExec) {
+    systemProperty 'java.library.path', projectDir.toString() + '/lib/tinyb'
+}

pems-server/src/main/java/org/maroubra/pemsserver/bootstrap/Main.java

@@ -30,10 +30,15 @@ public static void main(String[] args) {
         try {
             httpServer.start();
 
-            System.out.println(String.format("Jersey app started at %s\nHit enter to stop it...", serverConfiguration.fullHost()));
-            System.in.read();
+            System.out.println(String.format("Jersey app started at %s", serverConfiguration.fullHost()));
+
+            Runtime.getRuntime().addShutdownHook(new Thread(httpServer::shutdownNow));
+
+            Thread.currentThread().join();
         } catch (IOException e) {
-            log.error("error starting server: " + e.getLocalizedMessage(), e);
+            log.error("Error starting server: " + e.getLocalizedMessage(), e);
+        } catch (InterruptedException e) {
+            log.error("Server crash: %s", e);
         }
     }