diff --git a/common/cpp/src/logger/spd_logger.cpp b/common/cpp/src/logger/spd_logger.cpp
index 4b66a759cb36d2dc56f156464ee49cfb4b83ecb9..9228b8f6104db2154d7c17718f2c903209c23b9e 100644
--- a/common/cpp/src/logger/spd_logger.cpp
+++ b/common/cpp/src/logger/spd_logger.cpp
@@ -26,7 +26,7 @@ void SpdLogger::SetLogLevel(LogLevel level) {
}
}
std::string EncloseMsg(std::string msg) {
- if (msg.find(":") == std::string::npos) {
+ if (msg.find("\"") != 0) {
return std::string(R"("message":")") + msg + "\"";
} else {
return msg;
diff --git a/config/nomad/broker.nmd.in b/config/nomad/broker.nmd.in
index 211c71e21a640256e1b4aea1f334eed4bed3fa45..c0032fca94faf877999ea092142d98eed5d08e99 100644
--- a/config/nomad/broker.nmd.in
+++ b/config/nomad/broker.nmd.in
@@ -25,7 +25,7 @@ job "broker" {
}
service {
- name = "broker"
+ name = "asapo-broker"
port = "broker"
check {
name = "alive"
diff --git a/config/nomad/receiver.nmd.in b/config/nomad/receiver.nmd.in
index 1a9a6e893d1c6559a95ec3150e09509357c85e66..9642abb2314c77eb557a070c5e37ea1ef4dc30cd 100644
--- a/config/nomad/receiver.nmd.in
+++ b/config/nomad/receiver.nmd.in
@@ -23,7 +23,7 @@ job "receiver" {
}
service {
- name = "receiver"
+ name = "asapo-receiver"
port = "recv"
check {
name = "alive"
diff --git a/deploy/nomad_jobs/asapo-brokers.nmd.in b/deploy/nomad_jobs/asapo-brokers.nmd.in
new file mode 100644
index 0000000000000000000000000000000000000000..989929ba8fce5dd6d9c5c2e05ce1c5ce1fbbc3ce
--- /dev/null
+++ b/deploy/nomad_jobs/asapo-brokers.nmd.in
@@ -0,0 +1,75 @@
+job "asapo-brokers" {
+ datacenters = ["dc1"]
+
+ update {
+ max_parallel = 1
+ min_healthy_time = "10s"
+ healthy_deadline = "3m"
+ auto_revert = false
+ }
+
+ group "brokers" {
+ count = 1
+
+ restart {
+ attempts = 2
+ interval = "3m"
+ delay = "15s"
+ mode = "fail"
+ }
+
+ task "brokers" {
+ driver = "docker"
+
+ config {
+ network_mode = "host"
+ dns_servers = ["127.0.0.1"]
+ image = "yakser/asapo-broker:feature_ha"
+ force_pull = true
+ volumes = ["local/config.json:/var/lib/broker/config.json"]
+ logging {
+ type = "fluentd"
+ config {
+ fluentd-address = "localhost:9881"
+ tag = "asapo.docker"
+ }
+ }
+ }
+
+ resources {
+ network {
+ port "broker" {}
+ }
+ }
+
+ service {
+ port = "broker"
+ name = "asapo-broker"
+ check {
+ name = "asapo-broker-alive"
+ type = "http"
+ path = "/health"
+ interval = "10s"
+ timeout = "2s"
+ }
+ check_restart {
+ limit = 2
+ grace = "15s"
+ ignore_warnings = false
+ }
+ }
+
+ template {
+ source = "@NOMAD_INSTALL@/broker.json.tpl"
+ destination = "local/config.json"
+ change_mode = "restart"
+ }
+
+ template {
+ source = "@NOMAD_INSTALL@/broker_secret.key"
+ destination = "secrets/secret.key"
+ change_mode = "restart"
+ }
+ }
+ }
+}
diff --git a/deploy/nomad_jobs/asapo-logging.nmd.in b/deploy/nomad_jobs/asapo-logging.nmd.in
index ef4ce47101f1572d4845dbb235e83b3ddee1a8b4..e7c9cdfc11f030338b7b39e5a29d4fb9f3062025 100644
--- a/deploy/nomad_jobs/asapo-logging.nmd.in
+++ b/deploy/nomad_jobs/asapo-logging.nmd.in
@@ -20,6 +20,10 @@ job "asapo-logging" {
task "fluentd" {
driver = "docker"
+ meta {
+ change_me_to_restart = 1
+ }
+
config {
dns_servers = ["127.0.0.1"]
network_mode = "host"
diff --git a/deploy/nomad_jobs/asapo-mongo.nmd.in b/deploy/nomad_jobs/asapo-mongo.nmd.in
new file mode 100644
index 0000000000000000000000000000000000000000..87d25a01820d7d8f5a8e36245e65f2dc09b3a7c6
--- /dev/null
+++ b/deploy/nomad_jobs/asapo-mongo.nmd.in
@@ -0,0 +1,57 @@
+job "asapo-mongo" {
+ datacenters = ["dc1"]
+
+ update {
+ max_parallel = 1
+ min_healthy_time = "10s"
+ healthy_deadline = "3m"
+ auto_revert = false
+ }
+
+ group "mongo" {
+ count = 1
+
+ restart {
+ attempts = 2
+ interval = "3m"
+ delay = "15s"
+ mode = "delay"
+ }
+
+ task "mongo" {
+ driver = "docker"
+
+ config {
+ network_mode = "host"
+ image = "mongo:4.0.0"
+ volumes = ["/${meta.shared_storage}/mongodb:/data/db"]
+ }
+
+ resources {
+ network {
+ port "mongo" {
+ static = 27017
+ }
+ }
+ }
+
+ service {
+ port = "mongo"
+ name = "mongo"
+ check {
+ type = "script"
+ name = "alive"
+ command = "mongo"
+ args = ["--eval","db.version()"]
+ interval = "10s"
+ timeout = "5s"
+ }
+ check_restart {
+ limit = 2
+ grace = "90s"
+ ignore_warnings = false
+ }
+ }
+ }
+ }
+}
diff --git a/deploy/nomad_jobs/asapo-nginx.nmd.in b/deploy/nomad_jobs/asapo-nginx.nmd.in
index b417ac8fcd70840d6a789e56f2de3df7b6af31c6..b9455b414b9eca5a741dd2ff528b5eefb7a3ee18 100644
--- a/deploy/nomad_jobs/asapo-nginx.nmd.in
+++ b/deploy/nomad_jobs/asapo-nginx.nmd.in
@@ -1,4 +1,4 @@
-job "nginx" {
+job "asapo-nginx" {
datacenters = ["dc1"]
type = "system"
diff --git a/deploy/nomad_jobs/asapo-perfmetrics.nmd.in b/deploy/nomad_jobs/asapo-perfmetrics.nmd.in
index 3d9ec248de74663daa13222607a291632765e406..bb8db1b2ba4aa1b8254915d17de74f5124de1e91 100644
--- a/deploy/nomad_jobs/asapo-perfmetrics.nmd.in
+++ b/deploy/nomad_jobs/asapo-perfmetrics.nmd.in
@@ -28,8 +28,8 @@ job "asapo-perfmetrics" {
}
resources {
- cpu = 500
- memory = 256
+ cpu = 1500
+ memory = 32000
network {
mbits = 10
port "influxdb" {
@@ -74,8 +74,8 @@ job "asapo-perfmetrics" {
}
resources {
- cpu = 500
- memory = 256
+ cpu = 1500
+ memory = 2560
network {
mbits = 10
port "grafana" {
diff --git a/deploy/nomad_jobs/asapo-receivers.nmd.in b/deploy/nomad_jobs/asapo-receivers.nmd.in
index effb4e600c1b55c270d79a0847d126dbca3224be..c522fa07e1bf320e6aaccfff961ef3a963d13203 100644
--- a/deploy/nomad_jobs/asapo-receivers.nmd.in
+++ b/deploy/nomad_jobs/asapo-receivers.nmd.in
@@ -1,4 +1,4 @@
-job "receivers" {
+job "asapo-receivers" {
datacenters = ["dc1"]
update {
@@ -25,9 +25,16 @@ job "receivers" {
network_mode = "host"
dns_servers = ["127.0.0.1"]
image = "yakser/asapo-receiver:feature_ha"
- force_pull = true
+ force_pull = true
volumes = ["local/config.json:/var/lib/receiver/config.json",
"/bldocuments/support/asapo/data:/var/lib/receiver/data"]
+ logging {
+ type = "fluentd"
+ config {
+ fluentd-address = "localhost:9881"
+ tag = "asapo.docker"
+ }
+ }
}
resources {
@@ -38,13 +45,12 @@ job "receivers" {
service {
port = "recv"
- name = "recv"
+ name = "asapo-receiver"
check {
- name = "alive"
+ name = "asapo-receiver-alive"
type = "tcp"
interval = "10s"
timeout = "2s"
- initial_status = "passing"
}
check_restart {
limit = 2
@@ -61,3 +67,4 @@ job "receivers" {
}
}
}
+
diff --git a/deploy/nomad_jobs/asapo-services.nmd.in b/deploy/nomad_jobs/asapo-services.nmd.in
new file mode 100644
index 0000000000000000000000000000000000000000..4dc887eb4773c9c94f9c81a16afa8f9dd6423ae6
--- /dev/null
+++ b/deploy/nomad_jobs/asapo-services.nmd.in
@@ -0,0 +1,121 @@
+job "asapo-services" {
+ datacenters = ["dc1"]
+
+ type = "service"
+
+ group "asapo-authorizer" {
+ count = 1
+
+ task "asapo-authorizer" {
+ driver = "docker"
+
+ config {
+ network_mode = "host"
+ dns_servers = ["127.0.0.1"]
+ image = "yakser/asapo-authorizer:feature_ha"
+ force_pull = true
+ volumes = ["local/config.json:/var/lib/authorizer/config.json",
+ "/bldocuments/support/asapo/beamtime_beamline_mapping.txt:/var/lib/authorizer/beamtime_beamline_mapping.txt",
+ "/bldocuments/support/asapo/ip_beamtime_mapping:/var/lib/authorizer/ip_beamtime_mapping"]
+ logging {
+ type = "fluentd"
+ config {
+ fluentd-address = "localhost:9881"
+ tag = "asapo.docker"
+ }
+ }
+ }
+
+ resources {
+ cpu = 500 # 500 MHz
+ memory = 256 # 256MB
+ network {
+ port "authorizer" {
+ static = "5007"
+ }
+ }
+ }
+
+ service {
+ name = "asapo-authorizer"
+ port = "authorizer"
+ check {
+ name = "alive"
+ type = "http"
+ path = "/health-check"
+ interval = "10s"
+ timeout = "2s"
+ initial_status = "passing"
+ }
+ check_restart {
+ limit = 2
+ grace = "15s"
+ ignore_warnings = false
+ }
+ }
+
+ template {
+ source = "@NOMAD_INSTALL@/authorizer.json.tpl"
+ destination = "local/config.json"
+ change_mode = "restart"
+ }
+ }
+ } #authorizer
+ group "asapo-discovery" {
+ count = 1
+
+ task "asapo-discovery" {
+ driver = "docker"
+
+ config {
+ network_mode = "host"
+ dns_servers = ["127.0.0.1"]
+ image = "yakser/asapo-discovery:feature_ha"
+ force_pull = true
+ volumes = ["local/config.json:/var/lib/discovery/config.json"]
+ logging {
+ type = "fluentd"
+ config {
+ fluentd-address = "localhost:9881"
+ tag = "asapo.docker"
+ }
+ }
+ }
+
+ resources {
+ cpu = 500 # 500 MHz
+ memory = 256 # 256MB
+ network {
+ port "discovery" {
+ static = "5006"
+ }
+ }
+ }
+
+ service {
+ name = "asapo-discovery"
+ port = "discovery"
+ check {
+ name = "alive"
+ type = "http"
+ path = "/receivers"
+ interval = "10s"
+ timeout = "2s"
+ initial_status = "passing"
+ }
+ check_restart {
+ limit = 2
+ grace = "15s"
+ ignore_warnings = false
+ }
+
+ }
+
+ template {
+ source = "@NOMAD_INSTALL@/discovery.json.tpl"
+ destination = "local/config.json"
+ change_mode = "restart"
+ }
+ }
+ }
+}
diff --git a/deploy/nomad_jobs/authorizer.json.tpl b/deploy/nomad_jobs/authorizer.json.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..9dc4efbfa0d7b4c890afd29404789f0d1d2b1ae5
--- /dev/null
+++ b/deploy/nomad_jobs/authorizer.json.tpl
@@ -0,0 +1,11 @@
+{
+ "Port": {{ env "NOMAD_PORT_authorizer" }},
+ "LogLevel":"debug",
+ "AlwaysAllowedBeamtimes":[{"BeamtimeId":"asapo_test","Beamline":"test"},
+ {"BeamtimeId":"asapo_test1","Beamline":"test1"},
+ {"BeamtimeId":"asapo_test2","Beamline":"test2"}],
+ "BeamtimeBeamlineMappingFile":"//var//lib//authorizer//beamtime_beamline_mapping.txt",
+ "IpBeamlineMappingFolder":"//var//lib//authorizer//ip_beamtime_mapping"
+}
+
+
diff --git a/deploy/nomad_jobs/broker.json.tpl b/deploy/nomad_jobs/broker.json.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..fe73cff797cad90fa2908979fa11327e26dc0e38
--- /dev/null
+++ b/deploy/nomad_jobs/broker.json.tpl
@@ -0,0 +1,8 @@
+{
+ "BrokerDbAddress":"mongo.service.asapo:27017",
+ "MonitorDbAddress":"influxdb.service.asapo:8086",
+ "MonitorDbName": "asapo_brokers",
+ "port":{{ env "NOMAD_PORT_broker" }},
+ "LogLevel":"info",
+ "SecretFile":"/secrets/secret.key"
+}
\ No newline at end of file
diff --git a/deploy/nomad_jobs/discovery.json.tpl b/deploy/nomad_jobs/discovery.json.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..fdb2773288e50f17354d2ac36fff8bbcd923d999
--- /dev/null
+++ b/deploy/nomad_jobs/discovery.json.tpl
@@ -0,0 +1,10 @@
+{
+ "Mode": "consul",
+ "Receiver": {
+ "MaxConnections": 32
+ },
+ "Port": {{ env "NOMAD_PORT_discovery" }},
+ "LogLevel": "{{ keyOrDefault "log_level" "info" }}"
+}
+
+
diff --git a/deploy/nomad_jobs/fluentd.conf b/deploy/nomad_jobs/fluentd.conf
index 53068d69af5bcd1fccca36a79badcb2faf0fd87d..3c7d54708e94b1dc168d7dac3922e78447ae85b7 100644
--- a/deploy/nomad_jobs/fluentd.conf
+++ b/deploy/nomad_jobs/fluentd.conf
@@ -1,3 +1,10 @@
+<source>
+ @type forward
+ port 24224
+ source_hostname_key source_addr
+ bind 0.0.0.0
+</source>
+
<source>
@type http
port 9880
@@ -7,6 +14,23 @@
time_format %Y-%m-%d %H:%M:%S.%N
</source>
+<filter asapo.docker>
+ @type parser
+ key_name log
+ format json
+ time_format %Y-%m-%d %H:%M:%S.%N
+ reserve_data true
+</filter>
+
+<filter asapo.docker>
+ @type record_transformer
+ enable_ruby
+ remove_keys ["log","container_id","container_name"]
+ <record>
+ source_addr ${record["source_addr"].split('.')[0]}
+ </record>
+</filter>
+
<match asapo.**>
@type copy
<store>
@@ -28,3 +52,4 @@
path /shared/asapo-logs
</store>
</match>
+
diff --git a/deploy/nomad_jobs/init_influx.sh b/deploy/nomad_jobs/init_influx.sh
index 8163a932515406f0b4300b81182262b5184d943b..0319c4c4f38a2aa9f47e0f1e885600d665859c9a 100644
--- a/deploy/nomad_jobs/init_influx.sh
+++ b/deploy/nomad_jobs/init_influx.sh
@@ -1,5 +1,10 @@
#!/usr/bin/env bash
-influx=`dig +short @127.0.0.1 influxdb.service.asapo | head -1`
+influx=`dig +short @127.0.0.1 influxdb.service.asapo | head -1`
-curl -i -XPOST http://${influx}:8086/query --data-urlencode "q=CREATE DATABASE asapo_receivers"
\ No newline at end of file
+databases="asapo_receivers asapo_brokers"
+
+for database in $databases
+do
+ curl -i -XPOST http://${influx}:8086/query --data-urlencode "q=CREATE DATABASE $database"
+done
\ No newline at end of file
diff --git a/deploy/nomad_jobs/nginx.conf.tpl b/deploy/nomad_jobs/nginx.conf.tpl
index d6fd1a2ad8e22a86db00c57ac3c1eaaea9a7bc80..854cd7a18980c411e73c46d7aa9228f718692a7c 100644
--- a/deploy/nomad_jobs/nginx.conf.tpl
+++ b/deploy/nomad_jobs/nginx.conf.tpl
@@ -17,8 +17,8 @@ http {
resolver 127.0.0.1:53 valid=1s;
server {
listen {{ env "NOMAD_PORT_nginx" }};
- set $discovery_endpoint discovery.service.asapo;
- set $authorizer_endpoint authorizer.service.asapo;
+ set $discovery_endpoint asapo-discovery.service.asapo;
+# set $authorizer_endpoint asapo-authorizer.service.asapo;
set $fluentd_endpoint fluentd.service.asapo;
set $kibana_endpoint kibana.service.asapo;
set $grafana_endpoint grafana.service.asapo;
@@ -35,7 +35,6 @@ http {
location /logsview/ {
proxy_pass http://$kibana_endpoint:5601$uri$is_args$args;
- proxy_ignore_client_abort on;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
@@ -46,13 +45,29 @@ http {
proxy_pass http://$grafana_endpoint:3000$uri$is_args$args;
}
- location /authorizer/ {
- rewrite ^/authorizer(/.*) $1 break;
- proxy_pass http://$authorizer_endpoint:5007$uri$is_args$args;
- }
+# location /authorizer/ {
+# rewrite ^/authorizer(/.*) $1 break;
+# proxy_pass http://$authorizer_endpoint:5007$uri$is_args$args;
+# }
location /nginx-health {
return 200 "healthy\n";
}
}
}
+
+stream {
+ resolver 127.0.0.1:53 valid=1s;
+
+ map $remote_addr $upstream {
+ default fluentd.service.asapo;
+ }
+
+
+ server {
+ listen 9881;
+ proxy_pass $upstream:24224;
+ }
+}
+
+
diff --git a/deploy/nomad_jobs/receiver.json.tpl b/deploy/nomad_jobs/receiver.json.tpl
index 0edea1f14d4b366c2d080f67233793eb47b9b9be..b4cabe70803d549891023281c5586a021720c455 100644
--- a/deploy/nomad_jobs/receiver.json.tpl
+++ b/deploy/nomad_jobs/receiver.json.tpl
@@ -1,8 +1,8 @@
{
"MonitorDbAddress":"influxdb.service.asapo:8086",
"MonitorDbName": "asapo_receivers",
- "BrokerDbAddress":"localhost:27017",
- "AuthorizationServer": "authorizer.service.asapo:8400",
+ "BrokerDbAddress":"mongo.service.asapo:27017",
+ "AuthorizationServer": "asapo-authorizer.service.asapo:5007",
"AuthorizationInterval": 10000,
"ListenPort": {{ env "NOMAD_PORT_recv" }},
"Tag": "{{ env "NOMAD_ADDR_recv" }}",
diff --git a/deploy/nomad_jobs/start_asapo.sh b/deploy/nomad_jobs/start_asapo.sh
new file mode 100644
index 0000000000000000000000000000000000000000..a6c3491174bd12d0229db8346d4115fd111f6260
--- /dev/null
+++ b/deploy/nomad_jobs/start_asapo.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+nomad run asapo-nginx.nmd
+nomad run asapo-logging.nmd
+nomad run asapo-mongo.nmd
+nomad run asapo-services.nmd
+nomad run asapo-perfmetrics.nmd
+nomad run asapo-receivers.nmd
+nomad run asapo-brokers.nmd
diff --git a/deploy/nomad_jobs/stop_asapo.sh b/deploy/nomad_jobs/stop_asapo.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9ede6dd7d44e97a485f4baf5f257c4f09c194a60
--- /dev/null
+++ b/deploy/nomad_jobs/stop_asapo.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+nomad stop asapo-nginx
+nomad stop asapo-logging
+nomad stop asapo-mongo
+nomad stop asapo-services
+nomad stop asapo-perfmetrics
+nomad stop asapo-receivers
+nomad stop asapo-brokers
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_consul.go b/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
index 12f3dc13c98f64a0255a2ab05dd2d3194a5affe1..9c212504522a2ab0ba2d55a641f4c61293adba18 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_consul.go
@@ -53,7 +53,7 @@ func (rh *ConsulRequestHandler) GetReceivers() ([]byte, error) {
}
var response Responce
var err error
- response.Uris, err = rh.GetServices("receiver")
+ response.Uris, err = rh.GetServices("asapo-receiver")
if err != nil {
return nil, err
}
@@ -65,7 +65,7 @@ func (rh *ConsulRequestHandler) GetBroker() ([]byte, error) {
if (rh.client == nil) {
return nil, errors.New("consul client not connected")
}
- response, err := rh.GetServices("broker")
+ response, err := rh.GetServices("asapo-broker")
if err != nil {
return nil, err
}
diff --git a/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go b/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
index 716d545310d28be660ba634aa5b9a6a5680675be..002afc6e0f56fdda9ef764f084cae042cf09f530 100644
--- a/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
+++ b/discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go
@@ -49,16 +49,16 @@ func (suite *ConsulHandlerTestSuite) SetupTest() {
panic(err)
}
- suite.registerAgents("receiver")
- suite.registerAgents("broker")
+ suite.registerAgents("asapo-receiver")
+ suite.registerAgents("asapo-broker")
}
func (suite *ConsulHandlerTestSuite) TearDownTest() {
- suite.client.Agent().ServiceDeregister("receiver1234")
- suite.client.Agent().ServiceDeregister("receiver1235")
- suite.client.Agent().ServiceDeregister("broker1234")
- suite.client.Agent().ServiceDeregister("broker1235")
+ suite.client.Agent().ServiceDeregister("asapo-receiver1234")
+ suite.client.Agent().ServiceDeregister("asapo-receiver1235")
+ suite.client.Agent().ServiceDeregister("asapo-broker1234")
+ suite.client.Agent().ServiceDeregister("asapo-broker1235")
}
func (suite *ConsulHandlerTestSuite) TestInitDefaultUri() {
@@ -127,8 +127,8 @@ func (suite *ConsulHandlerTestSuite) TestGetBrokerRoundRobin() {
func (suite *ConsulHandlerTestSuite) TestGetBrokerEmpty() {
- suite.client.Agent().ServiceDeregister("broker1234")
- suite.client.Agent().ServiceDeregister("broker1235")
+ suite.client.Agent().ServiceDeregister("asapo-broker1234")
+ suite.client.Agent().ServiceDeregister("asapo-broker1235")
suite.handler.Init(consul_settings)
res, err := suite.handler.GetBroker()
diff --git a/examples/producer/dummy-data-producer/check_linux.sh b/examples/producer/dummy-data-producer/check_linux.sh
index c9601daa177e35f58479f84f2f9cc4ba3c7dc35e..f6a290300eaad68a91929ae1782f90710113234f 100644
--- a/examples/producer/dummy-data-producer/check_linux.sh
+++ b/examples/producer/dummy-data-producer/check_linux.sh
@@ -14,8 +14,7 @@ mkdir files
$@ files beamtime_id 11 4 4 1 10 2>&1 | grep Rate
-
-ls -ln files/0.bin | awk '{ print $5 }'| grep 11264
-ls -ln files/1.bin | awk '{ print $5 }'| grep 11264
-ls -ln files/2.bin | awk '{ print $5 }'| grep 11264
-ls -ln files/3.bin | awk '{ print $5 }'| grep 11264
+ls -ln files/0.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/1.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/2.bin | awk '{ print $5 }'| grep 11000
+ls -ln files/3.bin | awk '{ print $5 }'| grep 11000
diff --git a/examples/producer/dummy-data-producer/check_windows.bat b/examples/producer/dummy-data-producer/check_windows.bat
index 6270913bc8fc6118a3c7cc144ebf1467643dcb46..016a343469ca429802746830ecc92d168c570c4d 100644
--- a/examples/producer/dummy-data-producer/check_windows.bat
+++ b/examples/producer/dummy-data-producer/check_windows.bat
@@ -5,16 +5,16 @@ mkdir %folder%
"%1" %folder% beamtime_id 11 4 4 1 10 2>&1 | findstr "Rate" || goto :error
FOR /F "usebackq" %%A IN ('%folder%\0.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
FOR /F "usebackq" %%A IN ('%folder%\1.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
FOR /F "usebackq" %%A IN ('%folder%\2.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
FOR /F "usebackq" %%A IN ('%folder%\3.bin') DO set size=%%~zA
-if %size% NEQ 11264 goto :error
+if %size% NEQ 11000 goto :error
goto :clean
diff --git a/examples/producer/dummy-data-producer/dummy_data_producer.cpp b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
index 49769c2f73483957366cae0691991216effa94fc..87ca3582c44018c2cd66a7838acfbbac195a301c 100644
--- a/examples/producer/dummy-data-producer/dummy_data_producer.cpp
+++ b/examples/producer/dummy-data-producer/dummy_data_producer.cpp
@@ -25,7 +25,7 @@ struct Args {
void PrintCommandArguments(const Args& args) {
std::cout << "receiver_address: " << args.receiver_address << std::endl
<< "beamtime_id: " << args.beamtime_id << std::endl
- << "Package size: " << args.number_of_bytes / 1024 << "k" << std::endl
+ << "Package size: " << args.number_of_bytes / 1000 << "k" << std::endl
<< "iterations: " << args.iterations << std::endl
<< "nthreads: " << args.nthreads << std::endl
<< "mode: " << args.mode << std::endl
@@ -46,7 +46,7 @@ void ProcessCommandArguments(int argc, char* argv[], Args* args) {
try {
args->receiver_address = argv[1];
args->beamtime_id = argv[2];
- args->number_of_bytes = std::stoull(argv[3]) * 1024;
+ args->number_of_bytes = std::stoull(argv[3]) * 1000;
args->iterations = std::stoull(argv[4]);
args->nthreads = std::stoull(argv[5]);
args->mode = std::stoull(argv[6]);
@@ -120,7 +120,7 @@ void WaitThreadsFinished(const Args& args) {
void PrintOutput(const Args& args, const high_resolution_clock::time_point& start) {
high_resolution_clock::time_point t2 = high_resolution_clock::now();
double duration_sec = std::chrono::duration_cast<std::chrono::milliseconds>( t2 - start ).count() / 1000.0;
- double size_gb = double(args.number_of_bytes) * args.iterations / 1024.0 / 1024.0 / 1024.0 * 8.0;
+ double size_gb = double(args.number_of_bytes) * args.iterations / 1000.0 / 1000.0 / 1000.0 * 8.0;
double rate = args.iterations / duration_sec;
std::cout << "Rate: " << rate << " Hz" << std::endl;
std::cout << "Bandwidth " << size_gb / duration_sec << " Gbit/s" << std::endl;
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
index 972324483c226905c385cb6d51031366f4b52555..433d26bbe0e12a70bdb6cb9ebb733682b0ff2535 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
@@ -34,7 +34,7 @@ mkdir -p ${receiver_folder}
$1 localhost:8400 ${beamtime_id} 100 1 1 0 30
-ls -ln ${receiver_folder}/1.bin | awk '{ print $5 }'| grep 102400
+ls -ln ${receiver_folder}/1.bin | awk '{ print $5 }'| grep 100000
-$1 localhost:8400 wrong_beamtime_id 100 1 1 0 1 2>1 | grep "authorization failed"
\ No newline at end of file
+$1 localhost:8400 wrong_beamtime_id 100 1 1 0 1 2>1 | grep "authorization failed"
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
index 7a453b7b1663cb1aa81dc8c261079215cb836202..c17b785ea084fb75120e4e89f5d64db811d50cfe 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
@@ -22,7 +22,7 @@ mkdir %receiver_folder%
ping 1.0.0.0 -n 1 -w 100 > nul
FOR /F "usebackq" %%A IN ('%receiver_folder%\1.bin') DO set size=%%~zA
-if %size% NEQ 102400 goto :error
+if %size% NEQ 100000 goto :error
"%1" localhost:8400 wrong_id 100 1 1 0 2 2>1 | findstr /c:"authorization failed" || goto :error
diff --git a/tests/automatic/spd_logger/console/check_linux.sh b/tests/automatic/spd_logger/console/check_linux.sh
index bc934a732cde989660de74baa5737b84e07ed5a9..efc8f639ecf1566cd58168f3b54c4b7ff10302bd 100644
--- a/tests/automatic/spd_logger/console/check_linux.sh
+++ b/tests/automatic/spd_logger/console/check_linux.sh
@@ -5,6 +5,7 @@ set -e
res=`$@`
echo $res | grep '"level":"info","message":"test info"'
+echo $res | grep '"level":"info","message":"test : info"'
echo $res | grep '"test_int":2,"test_double":1.0}'
echo $res | grep '"level":"error","message":"test error"'
echo $res | grep '"level":"debug","message":"test debug"'
diff --git a/tests/automatic/spd_logger/console/check_windows.bat b/tests/automatic/spd_logger/console/check_windows.bat
index 78ecaf0a0ffb0006370b2c51093a62108cf727c6..e136f913210612b81331b515f08981d730c442c6 100644
--- a/tests/automatic/spd_logger/console/check_windows.bat
+++ b/tests/automatic/spd_logger/console/check_windows.bat
@@ -1,6 +1,7 @@
"%1" > output
findstr /I /L /C:"\"level\":\"info\",\"message\":\"test info\"" output || goto :error
+findstr /I /L /C:"\"level\":\"info\",\"message\":\"test : info\"" output || goto :error
findstr /I /L /C:"\"level\":\"error\",\"message\":\"test error\"" output || goto :error
findstr /I /L /C:"\"level\":\"debug\",\"message\":\"test debug\"" output || goto :error
findstr /I /L /C:"\"level\":\"warning\",\"message\":\"test warning\"" output || goto :error
diff --git a/tests/automatic/spd_logger/console/spd_logger_console.cpp b/tests/automatic/spd_logger/console/spd_logger_console.cpp
index 130e163f82edd8442cc03923436367fa37718e2e..e14e4bf856262d56e292a9cea107f40729566b43 100644
--- a/tests/automatic/spd_logger/console/spd_logger_console.cpp
+++ b/tests/automatic/spd_logger/console/spd_logger_console.cpp
@@ -32,6 +32,7 @@ int main(int argc, char* argv[]) {
logger->Warning("test warning");
logger->Debug("test debug");
+ logger->Info("test : info");
logger->SetLogLevel(LogLevel::Error);
logger->Info("test info_errorlev");