pespin submitted this change.

View Change

Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified lynxis lazus: Looks good to me, approved
StatsD_Checker: Allow configuring timeout

Change-Id: I183ad5810468cba5bfec20eb584a27462fde980c
---
M library/StatsD_Checker.ttcnpp
1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/library/StatsD_Checker.ttcnpp b/library/StatsD_Checker.ttcnpp
index b2b8332..a944176 100644
--- a/library/StatsD_Checker.ttcnpp
+++ b/library/StatsD_Checker.ttcnpp
@@ -80,7 +80,8 @@
#endif
port STATSD_PROC_PT STATSD_PROC;
port STATSD_CODEC_PT STATS;
- timer T_statsd := 5.0;
+ var float g_timeout;
+ timer T_statsd;
}

type component StatsD_ConnHdlr {
@@ -99,7 +100,7 @@


/* StatsD checker component */
-function main(charstring statsd_host, integer statsd_port) runs on StatsD_Checker_CT {
+function main(charstring statsd_host, integer statsd_port, float statsd_timeout := 5.0) runs on StatsD_Checker_CT {
var StatsD_ConnHdlr vc_conn;
var StatsDMetricKeys keys;
var boolean since_last_snapshot;
@@ -109,6 +110,8 @@
var StatsDMetrics snapshot;
var Result res;

+ g_timeout := statsd_timeout;
+
while (not mp_enable_stats) {
log("StatsD checker disabled by modulepar");
f_sleep(3600.0);
@@ -192,7 +195,7 @@
f_vty_transceive(STATSVTY, "stats report");
#endif

- T_statsd.start;
+ T_statsd.start(g_timeout);
while (seen_remain > 0) {
var StatsD_RecvFrom rf;
alt {
@@ -321,7 +324,7 @@
#endif
}

- T_statsd.start;
+ T_statsd.start(g_timeout);
while (matched_remain > 0) {
var StatsD_RecvFrom rf;
alt {
@@ -370,11 +373,11 @@
return true;
}

-function f_init_statsd(charstring id, inout StatsD_Checker_CT vc_STATSD, charstring local_addr, integer local_port) {
+function f_init_statsd(charstring id, inout StatsD_Checker_CT vc_STATSD, charstring local_addr, integer local_port, float statsd_timeout := 5.0) {
id := id & "-STATS";

vc_STATSD := StatsD_Checker_CT.create(id);
- vc_STATSD.start(StatsD_Checker.main(local_addr, local_port));
+ vc_STATSD.start(StatsD_Checker.main(local_addr, local_port, statsd_timeout));
}



To view, visit change 40618. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I183ad5810468cba5bfec20eb584a27462fde980c
Gerrit-Change-Number: 40618
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>