Merge pull request #405 from ondrej-fabry/fix-log-handlers

Fix log manager handlers

Author: VladoLavor

.travis.yml

@@ -4,15 +4,15 @@ sudo: required
 
 language: go
 go:
-  - 1.10.x
+  - "1.12.x"
+
+go_import_path: github.com/ligato/cn-infra
 
 addons:
   apt:
     packages:
       - npm
 
-go_import_path: github.com/ligato/cn-infra
-
 git:
   depth: 1
 
@@ -33,3 +33,10 @@ script:
 
 after_success:
   - goveralls -coverprofile=/tmp/coverage.out -service=travis-ci
+
+notifications:
+  slack:
+    rooms:
+      - ligato:QNOK2VgHH6k40T8nQxmSgRmo
+    on_success: change
+    on_failure: always

Makefile

@@ -67,7 +67,9 @@ clean-examples-plugin:
 
 # Get test tools
 get-testtools:
-	go get github.com/hashicorp/consul
+	@echo "=> installing test tools"
+	./scripts/install-consul.sh
+	consul version
 
 # Run tests
 test: get-testtools

logging/logmanager/plugin_impl_log_manager.go

@@ -119,7 +119,7 @@ func (p *Plugin) Init() error {
 //   > curl -X PUT http://localhost:<port>/log/<logger-name>/<log-level>
 func (p *Plugin) AfterInit() error {
 	if p.HTTP != nil {
-		p.HTTP.RegisterHTTPHandler(fmt.Sprintf("/log/{%s}/{%s:debug|info|warn|error|fatal|panic}",
+		p.HTTP.RegisterHTTPHandler(fmt.Sprintf("/log/{%s}/{%s}",
 			loggerVarName, levelVarName), p.logLevelHandler, "PUT")
 		p.HTTP.RegisterHTTPHandler("/log/list", p.listLoggersHandler, "GET")
 	}
@@ -161,7 +161,7 @@ func (p *Plugin) logLevelHandler(formatter *render.Render) http.HandlerFunc {
 		}
 		err := p.setLoggerLogLevel(vars[loggerVarName], vars[levelVarName])
 		if err != nil {
-			formatter.JSON(w, http.StatusNotFound,
+			formatter.JSON(w, http.StatusInternalServerError,
 				struct{ Error string }{err.Error()})
 			return
 		}

scripts/install-consul.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+CONSUL_VERSION=1.5.3
+
+download_url=https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip
+
+wget -nv -O /tmp/consul.zip ${download_url}
+unzip -o /tmp/consul.zip -d /tmp/consul
+sudo mv /tmp/consul/consul /usr/local/bin
+rm -rf /tmp/consul.zip /tmp/consul