From 8fa210d23fde556375e27e1c5ffb7243a034d785 Mon Sep 17 00:00:00 2001
From: amper43 <amper43@corpglory.com>
Date: Wed, 10 Oct 2018 15:24:23 +0300
Subject: [PATCH] remove debug logging

---
 .gitignore                               |  2 +-
 Makefile                                 | 12 ------------
 analytics/Dockerfile                     | 10 ++++++----
 analytics/config.py                      |  2 +-
 docker-compose.yml                       | 10 +++++-----
 server/Dockerfile                        | 17 +++++++++--------
 server/src/services/analytics_service.ts |  2 +-
 7 files changed, 23 insertions(+), 32 deletions(-)
 delete mode 100644 Makefile

diff --git a/.gitignore b/.gitignore
index bdafef7..b6debd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 data
 dist
-config/config.json
+config.json
 
 node_modules/
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5181763..0000000
--- a/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-.PHONY: server analytics compose
-
-all: server analytics
-
-server:
-	 docker build server -t hastic-server
-
-analytics:
-	 docker build analytics -t hastic-analytics
-
-compose:
-	 docker-compose up
diff --git a/analytics/Dockerfile b/analytics/Dockerfile
index c1e80eb..7b3e23a 100644
--- a/analytics/Dockerfile
+++ b/analytics/Dockerfile
@@ -1,11 +1,9 @@
 FROM python:3.6.6
 
-VOLUME [ "/var/www/data" ]
-
-COPY . /var/www/analytics/
-
 WORKDIR /var/www/analytics
 
+COPY ./requirements.txt /var/www/analytics
+
 RUN pip install -r requirements.txt \
  && apt-get update && apt-get install -y \
     apt-utils \
@@ -15,4 +13,8 @@ RUN pip install -r requirements.txt \
     g++ \
     git
 
+VOLUME [ "/var/www/data" ]
+
+COPY . /var/www/analytics/
+
 CMD ["python", "server.py"]
diff --git a/analytics/config.py b/analytics/config.py
index b867a3b..97faa14 100644
--- a/analytics/config.py
+++ b/analytics/config.py
@@ -27,4 +27,4 @@ def get_config_field(field, default_val = None):
     raise Exception('Please configure {}'.format(field))
 
 ZMQ_DEV_PORT = get_config_field('ZMQ_DEV_PORT', '8002')
-ZMQ_CONNECTION_STRING = get_config_field('ZMQ_CONNECTION_STRING', 'tcp://*:%s' % ZMQ_DEV_PORT)
+ZMQ_CONNECTION_STRING = get_config_field('ZMQ_CONNECTION_STRING', 'tcp://0.0.0.0:%s' % ZMQ_DEV_PORT)
diff --git a/docker-compose.yml b/docker-compose.yml
index d757602..da7c5e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,17 +4,17 @@ services:
     image: hastic-server
     build: server
     environment:
-      HASTIC_API_KEY: "eyJrIjoiNzhiYjIyTGZDMjY4M3lnYTNwWHo3WFVaNnVDSm9qakkiLCJuIjoiaGFzIiwiaWQiOjF9"
-      ZMQ_CONNECTION_STRING: tcp://analytics:8002
-    ports:
-      - 8000:8000
+      HASTIC_API_KEY: ${HASTIC_API_KEY}
+      ZMQ_CONNECTION_STRING: tcp://0.0.0.0:8002
+    network_mode: host
     volumes:
       - data-volume:/var/www/data
-    privileged: true
 
   analytics:
     image: hastic-analytics
     build: analytics
+    ports:
+      - 8002:8002
 
 volumes:
   data-volume:
diff --git a/server/Dockerfile b/server/Dockerfile
index 6db9cae..f893f61 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,11 +1,5 @@
 FROM python:3.6.6
 
-VOLUME [ "/var/www/data" ]
-
-COPY . /var/www/
-
-WORKDIR /var/www/server
-
 RUN apt-get install curl \
                     bash \
                     gnupg \
@@ -13,8 +7,15 @@ RUN apt-get install curl \
                     g++ \
  && curl -sL https://deb.nodesource.com/setup_8.x | bash - \
  && apt-get update \
- && apt-get install nodejs \
- && npm install \
+ && apt-get install nodejs
+
+VOLUME [ "/var/www/data" ]
+
+COPY . /var/www/server
+
+WORKDIR /var/www/server
+
+RUN npm install \
  && npm run build
 
 ENV INSIDE_DOCKER true
diff --git a/server/src/services/analytics_service.ts b/server/src/services/analytics_service.ts
index 6dda688..8cec1a4 100644
--- a/server/src/services/analytics_service.ts
+++ b/server/src/services/analytics_service.ts
@@ -76,7 +76,7 @@ export class AnalyticsService {
 
     if(this._inDocker) {
       this._zmqConnectionString = config.ZMQ_CONNECTION_STRING;
-    } else if(this._productionMode) {
+    } else if(this._productionMode && !this._inDocker) {
       this._zmqConnectionString = config.ZMQ_CONNECTION_STRING;
       if(this._zmqConnectionString === null) {
         var createResult = await AnalyticsService.createIPCAddress();