4 Incheckningar 48b177f5fb ... c58b9e7e85

Upphovsman SHA1 Meddelande Datum
  heewon c58b9e7e85 producer 생성 버그 수정, log formatter 수정 3 år sedan
  heewon 33a6c7c5f5 도커 컴포즈 development 파일 추가 3 år sedan
  heewon 99022b2898 도커 컴포즈 파일 수정(base file) 3 år sedan
  heewon a29dd68a54 코어 개수 환경설정 파일 생성 커맨드 추가 3 år sedan
4 ändrade filer med 38 tillägg och 26 borttagningar
  1. 28 0
      docker-compose.override.yml
  2. 0 18
      docker-compose.yml
  3. 7 8
      flask_app/app.py
  4. 3 0
      run_docker.sh

+ 28 - 0
docker-compose.override.yml

@@ -0,0 +1,28 @@
+version: "3"
+
+services:
+        flask_app:
+                container_name: flask_app
+                restart: always
+                build: ./flask_app
+                ports:
+                        - "9001:9001"                          
+                command: gunicorn -w ${CORE_NUMS} -b 0.0.0.0:9001 wsgi:server
+                volumes:
+                        - ~:/usr/src/flask_app/logs
+                environment:
+                        - SITE=buildpc
+                        - STREAM=ambt-preden-test
+                        - HOST=0.0.0.0
+                        - ID=AKIAUSTWEOGGEJICFGIP
+                        - KEY=Psz2Ao8Dp2rv0brrlIh4fiuDhJbCGqOMD4090tSo
+                        - FORMATTER_VER=2
+
+        nginx:
+                container_name: nginx
+                restart: always
+                build: ./nginx
+                ports:
+                        - "9999:9999"
+                depends_on:
+                        - flask_app

+ 0 - 18
docker-compose.yml

@@ -2,26 +2,8 @@ version: "3"
 
 services:
         flask_app:
-                container_name: flask_app
-                restart: always
-                build: ./flask_app
                 image: ive2go/app:1.0.0
-                ports:
-                        - "9001:9001"                          
-                command: gunicorn -w 1 -b 0.0.0.0:9001 wsgi:server
-                volumes:
-                        - ~:/usr/src/flask_app/logs
-                environment:
-                        - SITE=sujigangyosan
-                        - STREAM=ambt-preden-streams-dev
-                        - HOST=10.0.1.1
-
         nginx:
-                container_name: nginx
-                restart: always
-                build: ./nginx
                 image: ive2go/nginx:1.15.8
-                ports:
-                        - "9999:9999"
                 depends_on:
                         - flask_app

+ 7 - 8
flask_app/app.py

@@ -6,29 +6,28 @@ import boto3
 import logging
 import logging.handlers
 import os
+import time
 
 server = Flask(__name__)
 api = Api(server)
-
 session = boto3.Session( 
-        aws_access_key_id='AKIAUSTWEOGGEJICFGIP',
-        aws_secret_access_key='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',
+        aws_access_key_id=os.environ['ID'],
+        aws_secret_access_key=os.environ['KEY'],
         region_name='ap-northeast-2')
-
+producer = KinesisProducer(stream_name=os.environ['STREAM'],boto3_session=session)
 logger = logging.getLogger(__name__)
-formatter = logging.Formatter('%(message)s')
+os.environ['TZ'] = 'Asia/Seoul'
+time.tzset()
+formatter = logging.Formatter('%(message)s') if os.environ['FORMATTER_VER']==1 else logging.Formatter('[%(asctime)s] %(message)s', "%Y-%m-%d %H:%M:%S")
 fileHandler = logging.FileHandler('./logs/log')
 fileHandler.setFormatter(formatter)
 logger.addHandler(fileHandler)
 logger.setLevel(level=logging.INFO)
 class LogWallpad(Resource):
     def post(self):
-        producer = KinesisProducer(stream_name=os.environ['STREAM'],boto3_session=session)
         request.json['site']=os.environ['SITE']
         logger.info(json.dumps(request.json))
         producer.put(json.dumps(request.json)+'\n')
         return request.json, 201
 
 api.add_resource(LogWallpad, '/wallpad/log')
-
-

+ 3 - 0
run_docker.sh

@@ -1,5 +1,8 @@
 echo killing old docker processes
 docker-compose rm -fs
 
+echo make docker env
+eval "echo \"CORE_NUMS=$(grep -c processor /proc/cpuinfo)\"" > .env
+
 echo building docker containers
 docker-compose up --build -d