Merge pull request #5 from 30x/glide_version_lock
Glide version locked
diff --git a/cmd/apid/README.md b/cmd/apid/README.md
index 1f1cb6f..fa1d512 100644
--- a/cmd/apid/README.md
+++ b/cmd/apid/README.md
@@ -4,6 +4,7 @@
* [ApigeeSync](https://github.com/30x/apidApigeeSync)
* [VerifyAPIKey](https://github.com/30x/apidVerifyApiKey)
* [GatewayDeploy](https://github.com/30x/apidGatewayDeploy)
+* [ApigeeAnalytics](https://github.com/30x/apidAnalytics)
To change plugins list, edit main.go and update glide.yaml.
diff --git a/cmd/apid/apid_config_sample.yaml b/cmd/apid/apid_config_sample.yaml
index e84051e..a524b28 100644
--- a/cmd/apid/apid_config_sample.yaml
+++ b/cmd/apid/apid_config_sample.yaml
@@ -9,3 +9,4 @@
apigeesync_consumer_key: MDygyE8OD8rlemI7S1XhlUCA7jrarjxl
apigeesync_consumer_secret: oAuKUqRVvFVq0tzS
apigeesync_cluster_id: fc0e5137-d3fa-4017-8bfa-86b1103bc85d
+apidanalytics_uap_server_base: http://local.com:9001/edgex
\ No newline at end of file
diff --git a/cmd/apid/glide.yaml b/cmd/apid/glide.yaml
index 8809a98..cd7c376 100644
--- a/cmd/apid/glide.yaml
+++ b/cmd/apid/glide.yaml
@@ -8,3 +8,5 @@
version: master
- package: github.com/30x/apidVerifyAPIKey
version: master
+- package: github.com/30x/apidAnalytics
+ version: master
diff --git a/cmd/apid/main.go b/cmd/apid/main.go
index 7b76396..9d03595 100644
--- a/cmd/apid/main.go
+++ b/cmd/apid/main.go
@@ -5,6 +5,7 @@
_ "github.com/30x/apidApigeeSync"
_ "github.com/30x/apidVerifyAPIKey"
_ "github.com/30x/apidGatewayDeploy"
+ _ "github.com/30x/apidAnalytics"
// other imports
"github.com/30x/apid"
diff --git a/logger/logger.go b/logger/logger.go
index 874fea4..f1245d9 100644
--- a/logger/logger.go
+++ b/logger/logger.go
@@ -2,9 +2,11 @@
import (
"fmt"
+ "os"
+ "time"
+
"github.com/30x/apid"
"github.com/Sirupsen/logrus"
- "os"
)
const (
@@ -12,13 +14,16 @@
defaultLevel = logrus.DebugLevel
- moduleField = "module"
+ moduleField = "module"
environmentField = "env"
)
var std apid.LogService
-var textFormatter = new(logrus.TextFormatter)
var config apid.ConfigService
+var textFormatter = &logrus.TextFormatter{
+ FullTimestamp: false,
+ TimestampFormat: time.StampMilli,
+}
func Base() apid.LogService {
if std == nil {
@@ -42,7 +47,7 @@
func (l *logger) ForModule(name string) apid.LogService {
configKey := fmt.Sprintf("%s_%s", name, configLevel)
- log := NewLogger(configKey,config.GetString(configKey)).WithField(moduleField, name)
+ log := NewLogger(configKey, config.GetString(configKey)).WithField(moduleField, name)
std.Debugf("created logger '%s' at level %s", name, log.(loggerPlus).Level())
return log
}