提交 0e062071 authored 作者: zw.wang's avatar zw.wang

chore: docker and log

上级 88de7a77
version: "2" version: "2"
services: services:
influxdb:
container_name: influxdb
image: ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/influxdb:monitor
expose:
- "8083"
ports:
- 8086:8086
volumes:
- /var/lib/influxdb/:/var/lib/influxdb
environment:
- INFLUXDB_ADMIN_USER=admin
- INFLUXDB_ADMIN_PASSWORD=ilabservice123
redis:
image: ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/redis:4.0
container_name: redis
expose:
- "6379"
ports:
- 6379:6379
volumes:
- /var/lib/redis:/data
command: redis-server /etc/redis.conf --appendonly yes
api-server: api-server:
container_name: api-server container_name: api-server
build: build:
...@@ -23,27 +46,5 @@ services: ...@@ -23,27 +46,5 @@ services:
context: . context: .
volumes: volumes:
- /data/videos/isc-record:/data/videos/isc-record - /data/videos/isc-record:/data/videos/isc-record
- /var/log/event_rcv:/var/log/event_rcv
command: python hikvision_isc_client/merger.py command: python hikvision_isc_client/merger.py
influxdb:
container_name: influxdb
image: ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/influxdb:monitor
expose:
- "8083"
ports:
- 8086:8086
volumes:
- /var/lib/influxdb/:/var/lib/influxdb
environment:
- INFLUXDB_ADMIN_USER=admin
- INFLUXDB_ADMIN_PASSWORD=ilabservice123
redis:
image: ilabservice-registry.cn-hangzhou.cr.aliyuncs.com/basic/redis:4.0
container_name: redis
expose:
- "6379"
ports:
- 6379:6379
volumes:
- /var/lib/redis:/data
command: redis-server /etc/redis.conf --appendonly yes
...@@ -4,12 +4,13 @@ import hmac ...@@ -4,12 +4,13 @@ import hmac
import base64 import base64
import requests import requests
import dateutil.parser import dateutil.parser
from requests.packages import urllib3
from email.utils import formatdate
from datetime import datetime, timedelta from datetime import datetime, timedelta
from time import mktime from time import mktime
from email.utils import formatdate
from requests.packages import urllib3
from intelab_python_sdk.logger import log
class HikVisionClient(object): class HikVisionClient(object):
def __init__(self, app_key, app_secret, host, port, https=True): def __init__(self, app_key, app_secret, host, port, https=True):
...@@ -58,9 +59,9 @@ class HikVisionClient(object): ...@@ -58,9 +59,9 @@ class HikVisionClient(object):
if 'data' in res_json: if 'data' in res_json:
data = res_json['data'] data = res_json['data']
else: else:
print(res_json['msg']) log.warning(res_json['msg'])
else: else:
print('error: ', response.text) log.error('error: %s', response.text)
return data return data
def get_camera_preview_url(self, camera_index_code, def get_camera_preview_url(self, camera_index_code,
...@@ -130,7 +131,7 @@ class HikVisionClient(object): ...@@ -130,7 +131,7 @@ class HikVisionClient(object):
'expand': 'fileSize=1024', 'expand': 'fileSize=1024',
'streamform': streamform 'streamform': streamform
} }
print('requests body: {}'.format(body)) log.info('requests body: {}'.format(body))
expired_time = datetime.now() + timedelta(minutes=5) expired_time = datetime.now() + timedelta(minutes=5)
res = self._request(uri, body) res = self._request(uri, body)
results = [] results = []
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论