restructure go files

discovery/CMakeLists.txt

@@ -11,10 +11,10 @@ endif()
 message(STATUS "global gopath ${GOPATH}")
 
 IF(WIN32)
-    set (gopath "${GOPATH}\;${CMAKE_CURRENT_SOURCE_DIR}")
+    set (gopath "${GOPATH}\;${CMAKE_CURRENT_SOURCE_DIR}\;${CMAKE_SOURCE_DIR}/common/go")
     set (exe_name "${TARGET_NAME}.exe")
 ELSE()
-    set (gopath ${GOPATH}:${CMAKE_CURRENT_SOURCE_DIR})
+    set (gopath ${GOPATH}:${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/common/go)
     set (exe_name "${TARGET_NAME}")
 ENDIF()
 

discovery/src/asapo_discovery/logger/logger.go

-package logger
-
-import (
-	"errors"
-	"strings"
-)
-
-type Level uint32
-
-//log levels
-const (
-	InfoLevel = iota
-	DebugLevel
-	ErrorLevel
-	WarnLevel
-	FatalLevel
-)
-
-type Logger interface {
-	Info(args ...interface{})
-	Debug(args ...interface{})
-	Fatal(args ...interface{})
-	Warning(args ...interface{})
-	Error(args ...interface{})
-	SetLevel(level Level)
-}
-
-var my_logger Logger = &logRusLogger{}
-
-func Info(args ...interface{}) {
-	my_logger.Info(args...)
-}
-
-func Debug(args ...interface{}) {
-	my_logger.Debug(args...)
-}
-
-func Warning(args ...interface{}) {
-	my_logger.Warning(args...)
-}
-
-func Error(args ...interface{}) {
-	my_logger.Error(args...)
-}
-
-func Fatal(args ...interface{}) {
-	my_logger.Fatal(args...)
-}
-
-func SetLevel(level Level) {
-	my_logger.SetLevel(level)
-}
-
-func LevelFromString(str string) (Level, error) {
-	switch strings.ToLower(str) {
-	case "debug":
-		return DebugLevel, nil
-	case "info":
-		return InfoLevel, nil
-	case "warning":
-		return WarnLevel, nil
-	case "error":
-		return ErrorLevel, nil
-	case "fatal", "none":
-		return FatalLevel, nil
-	}
-	return FatalLevel, errors.New("wrong log level")
-
-}

discovery/src/asapo_discovery/logger/mock_logger.go

-//+build !release
-
-package logger
-
-import (
-	"github.com/stretchr/testify/mock"
-)
-
-type MockLogger struct {
-	mock.Mock
-}
-
-var MockLog MockLogger
-
-func SetMockLog() {
-	my_logger = &MockLog
-}
-
-func UnsetMockLog() {
-	my_logger = &logRusLogger{}
-}
-
-func (l *MockLogger) Info(args ...interface{}) {
-	l.Called(args...)
-	return
-}
-
-func (l *MockLogger) Debug(args ...interface{}) {
-	l.Called(args...)
-	return
-}
-
-func (l *MockLogger) Error(args ...interface{}) {
-	l.Called(args...)
-	return
-}
-
-func (l *MockLogger) Warning(args ...interface{}) {
-	l.Called(args...)
-	return
-}
-
-func (l *MockLogger) Fatal(args ...interface{}) {
-	l.Called(args...)
-	return
-}
-
-func (l *MockLogger) SetLevel(level Level) {
-	l.Called(level)
-	return
-}

discovery/src/asapo_discovery/main/discovery.go

@@ -4,7 +4,7 @@ package main
 
 import (
 	"flag"
-	log "asapo_discovery/logger"
+	log "asapo_common/logger"
 	"asapo_discovery/server"
 	"os"
 	"asapo_discovery/request_handler"

discovery/src/asapo_discovery/request_handler/request_handler.go

 package request_handler
 
-import "asapo_discovery/utils"
+import "asapo_common/utils"
 
 type Agent interface {
 	GetReceivers() ([]byte, error)

discovery/src/asapo_discovery/request_handler/request_handler_consul.go

 package request_handler
 
 import (
-	"asapo_discovery/utils"
+	"asapo_common/utils"
 	"github.com/hashicorp/consul/api"
 	"strconv"
 	"errors"

discovery/src/asapo_discovery/request_handler/request_handler_consul_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"github.com/hashicorp/consul/api"
 	"strconv"
-	"asapo_discovery/utils"
+	"asapo_common/utils"
 )
 
 type ConsulHandlerTestSuite struct {

discovery/src/asapo_discovery/request_handler/request_handler_static.go

 package request_handler
 
 import (
-	"asapo_discovery/utils"
+	"asapo_common/utils"
 )
 
 type StaticRequestHandler struct {

discovery/src/asapo_discovery/request_handler/request_handler_static_test.go

@@ -3,7 +3,7 @@ package request_handler
 import (
 	"github.com/stretchr/testify/assert"
 	"testing"
-    "asapo_discovery/utils"
+    "asapo_common/utils"
 )
 
 

discovery/src/asapo_discovery/server/get_receivers.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"net/http"
-	"asapo_discovery/logger"
+	"asapo_common/logger"
 	"errors"
 )
 

discovery/src/asapo_discovery/server/listroutes.go

 package server
 
 import (
-	"asapo_discovery/utils"
+	"asapo_common/utils"
 )
 
 var listRoutes = utils.Routes{

discovery/src/asapo_discovery/server/routes_test.go

@@ -3,8 +3,8 @@ package server
 import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"asapo_discovery/logger"
-	"asapo_discovery/utils"
+	"asapo_common/logger"
+	"asapo_common/utils"
 	"net/http"
 	"net/http/httptest"
 	"strings"

discovery/src/asapo_discovery/server/server.go

@@ -2,7 +2,7 @@ package server
 
 import (
 	"asapo_discovery/request_handler"
-	"asapo_discovery/utils"
+	"asapo_common/utils"
 )
 
 var requestHandler request_handler.Agent

discovery/src/asapo_discovery/server/server_nottested.go

@@ -3,8 +3,8 @@
 package server
 
 import (
-	log "asapo_discovery/logger"
-	"asapo_discovery/utils"
+	log "asapo_common/logger"
+	"asapo_common/utils"
 	"net/http"
 	"strconv"
 )

discovery/src/asapo_discovery/server/settings_test.go

@@ -3,7 +3,7 @@ package server
 import (
 	"github.com/stretchr/testify/assert"
 	"testing"
-	"asapo_discovery/utils"
+	"asapo_common/utils"
 )
 
 func fillSettings(mode string) utils.Settings {

discovery/src/asapo_discovery/utils/helpers.go

-package utils
-
-import (
-	json "encoding/json"
-	"io/ioutil"
-)
-
-func StringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
-func MapToJson(res interface{}) ([]byte, error) {
-	answer, err := json.Marshal(res)
-	if err == nil {
-		return answer, nil
-	} else {
-		return nil, err
-	}
-}
-
-func ReadJsonFromFile(fname string, config interface{}) error {
-	content, err := ioutil.ReadFile(fname)
-	if err != nil {
-		return err
-	}
-
-	err = json.Unmarshal(content, config)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

examples/producer/dummy-data-producer/dummy_data_producer.cpp

@@ -35,7 +35,8 @@ void PrintCommandArguments(const Args& args) {
 void ProcessCommandArguments(int argc, char* argv[], Args* args) {
     if (argc != 7) {
         std::cout <<
-                  "Usage: " << argv[0] << " <destination> <beamtime_id> <number_of_byte> <iterations> <nthreads> <mode 0 -t tcp, 1 - filesystem>"
+                  "Usage: " << argv[0] <<
+                  " <destination> <beamtime_id> <number_of_byte> <iterations> <nthreads> <mode 0 -t tcp, 1 - filesystem>"
                   << std::endl;
         exit(EXIT_FAILURE);
     }
@@ -82,7 +83,7 @@ std::unique_ptr<asapo::Producer> CreateProducer(const Args& args) {
     asapo::Error err;
     auto producer = asapo::Producer::Create(args.receiver_address, args.nthreads,
                                             args.mode == 0 ? asapo::RequestHandlerType::kTcp : asapo::RequestHandlerType::kFilesystem,
-                                            args.beamtime_id,&err);
+                                            args.beamtime_id, &err);
     if(err) {
         std::cerr << "Cannot start producer. ProducerError: " << err << std::endl;
         exit(EXIT_FAILURE);

producer/api/include/producer/producer.h

@@ -17,7 +17,7 @@ class Producer {
      * @return A unique_ptr to a new producer instance
      */
     static std::unique_ptr<Producer> Create(const std::string& endpoint, uint8_t n_processing_threads,
-                                            asapo::RequestHandlerType type,std::string beamtime_id,
+                                            asapo::RequestHandlerType type, std::string beamtime_id,
                                             Error* err);
 
     virtual ~Producer() = default;

producer/api/src/producer_impl.cpp

@@ -32,7 +32,7 @@ GenericRequestHeader ProducerImpl::GenerateNextSendRequest(uint64_t file_id, siz
     return request;
 }
 
-Error CheckProducerRequest(size_t file_size,size_t filename_size) {
+Error CheckProducerRequest(size_t file_size, size_t filename_size) {
     if (file_size > ProducerImpl::kMaxChunkSize) {
         return ProducerErrorTemplates::kFileTooLarge.Generate();
     }
@@ -50,7 +50,7 @@ Error ProducerImpl::Send(uint64_t file_id, const void* data, size_t file_size, s
 
     auto err = CheckProducerRequest(file_size, file_name.size());
     if (err) {
-        log__->Error("error checking request - "+err->Explain());
+        log__->Error("error checking request - " + err->Explain());
         return err;
     }
 
@@ -81,7 +81,7 @@ Error ProducerImpl::SetBeamtimeId(std::string beamtime_id) {
     }
 
     if (beamtime_id.size() > kMaxMessageSize) {
-        log__->Error("beamtime_id is too long - "+beamtime_id);
+        log__->Error("beamtime_id is too long - " + beamtime_id);
         return ProducerErrorTemplates::kBeamtimeIdTooLong.Generate();
     }