v1.1.1 : Fixed functional tests & Multiple bugfixes

This commit is contained in:
Brendan LE GLAUNEC
2016-11-12 12:55:32 +01:00
parent f80af6bd58
commit 553524ae43
34 changed files with 663 additions and 356 deletions
+10 -8
View File
@@ -1,14 +1,16 @@
{
"mysql_db" : {
"host" : "0.0.0.0",
"host" : "cameradar-database",
"port" : 3306,
"user": "root",
"password": "root",
"db_name": "cctv"
"db_name": "cmrdr"
},
"subnets" : "172.16.100.13 localhost",
"ports" : "554,8554", // if not specified, default will be 1-65535
"rtsp_url_file" : "conf/url.json",
"rtsp_ids_file" : "conf/ids.json",
"thumbnail_storage_path" : "/ce/que/tu/veux"
}
"subnets" : "localhost",
"ports" : "554,8554",
"rtsp_url_file" : "/conf/url.json",
"rtsp_ids_file" : "/conf/ids.json",
"thumbnail_storage_path" : "/tmp",
"cache_manager_path" : "/cameradar/cache_managers",
"cache_manager_name" : "dumb"
}
+13 -13
View File
@@ -2,19 +2,19 @@
"Output": "cameratest.log.xml",
"Cameradar" : {
"Path": "/home/ullaakut/Work/cctv_server2/cameradar/test/cameradar",
"Args": "-l 1 -c tmp_config",
"Ports": "554,5554,8554",
"IdsPath": "conf/ids.json",
"RoutesPath": "conf/url.json",
"ThumbPath": "/home/ullaakut/.cctv",
"dbHost": "0.0.0.0",
"dbPort": 3306,
"dbUser": "root",
"dbPassword": "root",
"dbName": "cctv",
"Console": false
},
"Path": "/cameradar/cameradar_standalone/cameradar",
"Args": "-s 172.17.0.0/24 -c /conf/cameradar.conf.json --gst-rtsp-server",
"Ports": "554,5554,8554",
"IdsPath": "/conf/ids.json",
"RoutesPath": "/conf/url.json",
"ThumbPath": "/tmp",
"dbHost": "cameradar-database",
"dbPort": 3306,
"dbUser": "root",
"dbPassword": "root",
"dbName": "cmrdr",
"Console": false
},
"Tests" : [
{
"address" : "127.0.0.1",