restructure go files

broker/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()
 

broker/src/asapo_broker/database/mongodb.go

@@ -3,7 +3,7 @@
 package database
 
 import (
-	"asapo_broker/utils"
+	"asapo_common/utils"
 	"encoding/json"
 	"errors"
 	"gopkg.in/mgo.v2"

broker/src/asapo_broker/database/mongodb_test.go

@@ -3,7 +3,7 @@
 package database
 
 import (
-	"asapo_broker/utils"
+	"asapo_common/utils"
 	"encoding/json"
 	"github.com/stretchr/testify/assert"
 	"sync"

broker/src/asapo_broker/logger/logrus_logger.go

-package logger
-
-import (
-	log "github.com/sirupsen/logrus"
-)
-
-type logRusLogger struct {
-	logger_entry *log.Entry
-}
-
-func (l *logRusLogger) entry() *log.Entry {
-	if l.logger_entry != nil {
-		return l.logger_entry
-	}
-
-	formatter := &log.JSONFormatter{
-		FieldMap: log.FieldMap{
-			log.FieldKeyMsg: "message",
-		},
-		TimestampFormat: "2006-01-02 15:04:05.000",
-	}
-
-	log.SetFormatter(formatter)
-
-	l.logger_entry = log.WithFields(log.Fields{
-		"source": "broker",
-	})
-
-	return l.logger_entry
-
-}
-
-func (l *logRusLogger) Info(args ...interface{}) {
-	l.entry().Info(args...)
-	return
-}
-
-func (l *logRusLogger) Debug(args ...interface{}) {
-	l.entry().Debug(args...)
-	return
-}
-
-func (l *logRusLogger) Error(args ...interface{}) {
-	l.entry().Error(args...)
-	return
-}
-
-func (l *logRusLogger) Warning(args ...interface{}) {
-	l.entry().Warning(args...)
-	return
-}
-
-func (l *logRusLogger) Fatal(args ...interface{}) {
-	l.entry().Fatal(args...)
-	return
-}
-
-func (l *logRusLogger) SetLevel(level Level) {
-	logrusLevel := log.InfoLevel
-	switch level {
-	case DebugLevel:
-		logrusLevel = log.DebugLevel
-	case InfoLevel:
-		logrusLevel = log.InfoLevel
-	case WarnLevel:
-		logrusLevel = log.WarnLevel
-	case ErrorLevel:
-		logrusLevel = log.ErrorLevel
-	case FatalLevel:
-		logrusLevel = log.FatalLevel
-	}
-
-	log.SetLevel(logrusLevel)
-	return
-}

broker/src/asapo_broker/main/broker.go

@@ -3,10 +3,10 @@
 package main
 
 import (
-	"flag"
 	"asapo_broker/database"
-	log "asapo_broker/logger"
 	"asapo_broker/server"
+	log "asapo_common/logger"
+	"flag"
 	"os"
 )
 

broker/src/asapo_broker/server/get_id.go

 package server
 
 import (
-	"asapo_broker/logger"
-	"asapo_broker/utils"
+	"asapo_common/logger"
+	"asapo_common/utils"
 	"github.com/gorilla/mux"
 	"net/http"
 	"strconv"

broker/src/asapo_broker/server/get_id_test.go

@@ -2,8 +2,8 @@ package server
 
 import (
 	"asapo_broker/database"
-	"asapo_broker/logger"
-	"asapo_broker/utils"
+	"asapo_common/logger"
+	"asapo_common/utils"
 	"errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

broker/src/asapo_broker/server/get_next.go

@@ -2,8 +2,8 @@ package server
 
 import (
 	"asapo_broker/database"
-	"asapo_broker/logger"
-	"asapo_broker/utils"
+	"asapo_common/logger"
+	"asapo_common/utils"
 	"github.com/gorilla/mux"
 	"net/http"
 )

broker/src/asapo_broker/server/get_next_test.go

 package server
 
 import (
+	"asapo_broker/database"
+	"asapo_common/logger"
+	"asapo_common/utils"
 	"errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
-	"asapo_broker/database"
-	"asapo_broker/logger"
-	"asapo_broker/utils"
 	"net/http"
 	"net/http/httptest"
 	"strings"

broker/src/asapo_broker/server/listroutes.go

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

broker/src/asapo_broker/server/server_nottested.go

@@ -3,9 +3,9 @@
 package server
 
 import (
+	log "asapo_common/logger"
+	"asapo_common/utils"
 	"errors"
-	log "asapo_broker/logger"
-	"asapo_broker/utils"
 	"net/http"
 	"strconv"
 )

broker/src/asapo_broker/server/server_test.go

 package server
 
 import (
+	"asapo_broker/database"
+	"asapo_common/logger"
 	"errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"asapo_broker/database"
-	"asapo_broker/logger"
 	"testing"
 )
 

broker/src/asapo_broker/server/statistics.go

 package server
 
 import (
+	log "asapo_common/logger"
 	"fmt"
-	log "asapo_broker/logger"
 	"sync"
 	"time"
 )

broker/src/asapo_broker/utils/routes.go

-package utils
-
-import (
-	"net/http"
-
-	"github.com/gorilla/mux"
-	"strings"
-)
-
-type Routes []Route
-
-type Route struct {
-	Name        string
-	Method      string
-	Pattern     string
-	HandlerFunc http.HandlerFunc
-}
-
-func NewRouter(listRoutes Routes) *mux.Router {
-	router := mux.NewRouter()
-	for _, route := range listRoutes {
-		router.
-			Methods(route.Method).
-			Path(route.Pattern).
-			Name(route.Name).
-			Handler(route.HandlerFunc)
-		// allow routes without trailing slash
-		if strings.HasSuffix(route.Pattern, "/") {
-			router.
-				Methods(route.Method).
-				Path(strings.TrimSuffix(route.Pattern, "/")).
-				Name(route.Name + "_noslash").
-				Handler(route.HandlerFunc)
-		}
-	}
-	return router
-}