disocvery_execution : run discovery at init to cover unittest

Change-Id: I5274216dd4322c936ce9032f0749754701830262

diff --git a/src/CMain/inc/linux_arm/orchestration.h b/src/CMain/inc/linux_arm/orchestration.h
index e7df7450025dc922c87bb0a35ca822dc0e253a0f..e2cf75b5938bf1990017a72f4fbd6a618d3dfbac 100644 (file)
--- a/src/CMain/inc/linux_arm/orchestration.h
+++ b/src/CMain/inc/linux_arm/orchestration.h
@@ -3,14 +3,16 @@
 /* package interface */
 
 
-#line 1 "cgo-builtin-prolog"
+#line 1 "cgo-builtin-export-prolog"
 
 #include <stddef.h> /* for ptrdiff_t below */
 
 #ifndef GO_CGO_EXPORT_PROLOGUE_H
 #define GO_CGO_EXPORT_PROLOGUE_H
 
+#ifndef GO_CGO_GOSTRING_TYPEDEF
 typedef struct { const char *p; ptrdiff_t n; } _GoString_;
+#endif
 
 #endif
 
@@ -69,7 +71,9 @@ typedef double _Complex GoComplex128;
 */
 typedef char _check_for_32_bit_pointer_matching_GoInt[sizeof(void*)==32/8 ? 1:-1];
 
+#ifndef GO_CGO_GOSTRING_TYPEDEF
 typedef _GoString_ GoString;
+#endif
 typedef void *GoMap;
 typedef void *GoChan;
 typedef struct { void *t; void *v; } GoInterface;

diff --git a/src/CMain/lib/linux_arm/liborchestration-0.0.1-20190419.1558.a b/src/CMain/lib/linux_arm/liborchestration-0.0.1-20190419.1558.a
deleted file mode 100644 (file)
index 1c5bdcf..0000000
Binary files a/src/CMain/lib/linux_arm/liborchestration-0.0.1-20190419.1558.a and /dev/null differ

diff --git a/src/CMain/lib/linux_arm/liborchestration-0.0.1-20190423.1324.a b/src/CMain/lib/linux_arm/liborchestration-0.0.1-20190423.1324.a
new file mode 100644 (file)
index 0000000..bd61771
Binary files /dev/null and b/src/CMain/lib/linux_arm/liborchestration-0.0.1-20190423.1324.a differ

diff --git a/src/CMain/lib/linux_arm/liborchestration.a b/src/CMain/lib/linux_arm/liborchestration.a
index ad24ef83049ad75e8fda97eadafd30ef9ba1da0d..30c82fd6ae38f4b5406a06a565988d13f1c7647c 120000 (symlink)
--- a/src/CMain/lib/linux_arm/liborchestration.a
+++ b/src/CMain/lib/linux_arm/liborchestration.a
@@ -1 +1 @@
-liborchestration-0.0.1-20190419.1558.a
\ No newline at end of file
+liborchestration-0.0.1-20190423.1324.a
\ No newline at end of file

diff --git a/src/discoverymgr/discovery_execution.go b/src/discoverymgr/discovery_execution.go
index 1f7814697b2487cc1d442e74a763a45538b41093..359a854b1674d20e5e9a077ba8446a521dc4c6e5 100755 (executable)
--- a/src/discoverymgr/discovery_execution.go
+++ b/src/discoverymgr/discovery_execution.go
@@ -65,7 +65,6 @@ func discoveryBGR() {
        discoveryPeriod := maxPollingTime
        // discoveryPeriod := 3 * 1000
        for {
-               time.Sleep(time.Duration(discoveryPeriod) * time.Millisecond)
 
                data, err := discoverDevice(5000)
                if err != nil {
@@ -80,6 +79,7 @@ func discoveryBGR() {
                        zeroconf.DeviceMap[k] = v
                }
                zeroconf.MapMTX.Unlock()
+               time.Sleep(time.Duration(discoveryPeriod) * time.Millisecond)
 
                // if discoveryPeriod > maxPollingTime {
                //      time.Sleep(maxPollingTime * time.Millisecond)

diff --git a/src/discoverymgr/discovery_setTXT.go b/src/discoverymgr/discovery_setTXT.go
index 02327d0389c4d479749857006ff538743f2b0f1e..05cfdd069b1c70c8a7fff26bdd0c3fc4423b7f74 100755 (executable)
--- a/src/discoverymgr/discovery_setTXT.go
+++ b/src/discoverymgr/discovery_setTXT.go
@@ -26,12 +26,6 @@ import (
 var serverTXT []string
 var serverTXTmtx sync.Mutex
 
-//ResetServiceName will reset txt of mdns message
-func ResetServiceName() error {
-       serverTXT = nil
-       return SetServiceNames("")
-}
-
 //AddNewServiceName add servicename to orchestration server
 func AddNewServiceName(doc *confdescription.Doc) error {