Commit c2a809b8 authored by Marco Gonzalez Hierro's avatar Marco Gonzalez Hierro

Merge branch 'edinburgh' of https://github.com/edgexfoundry/edgex-go into konnekt

parents b517051c b4a4fa47
......@@ -15,7 +15,7 @@ LogLevel = 'INFO'
BootTimeout = 30000
ClientMonitor = 15000
CheckInterval = '10s'
Host = 'localhost'
Host = 'edgex-sys-mgmt-agent'
Port = 48090
Protocol = 'http'
MaxResultCount = 50000
......
......@@ -215,6 +215,20 @@ func eventHandler(w http.ResponseWriter, r *http.Request) {
return
}
newId, err := addNewEvent(evt, ctx)
if err != nil {
switch e := err.(type) {
case *errors.ErrValueDescriptorNotFound:
http.Error(w, err.Error(), http.StatusNotFound)
case *errors.ErrValueDescriptorInvalid:
http.Error(w, err.Error(), http.StatusBadRequest)
case *types.ErrServiceClient:
http.Error(w, e.Error(), e.StatusCode)
default:
http.Error(w, err.Error(), http.StatusInternalServerError)
}
LoggingClient.Error(err.Error())
return
}
w.WriteHeader(http.StatusOK)
w.Write([]byte(newId))
......
name: edgexfoundry
base: core18
version: "replace-me"
version-script: |
echo $(cat VERSION)-$(date +%Y%m%d)+$(git rev-parse --short HEAD)
adopt-info: version
summary: Open-source framework for IoT edge computing
description: |
EdgeX Foundry is a vendor-neutral open source project hosted by The Linux
......@@ -340,6 +338,11 @@ apps:
- network-bind
parts:
version:
plugin: nil
source: .
override-pull: |
snapcraftctl set-version $(cat $SNAPCRAFT_PROJECT_DIR/VERSION)-$(date +%Y%m%d)+$(git rev-parse --short HEAD)
curl:
plugin: nil
# the default source for a part that doesn't specify one is ".", which
......@@ -492,6 +495,7 @@ parts:
redis.conf > $SNAPCRAFT_PART_INSTALL/config/redis/redis.conf
mongo-config:
source: https://github.com/edgexfoundry/docker-edgex-mongo.git
source-branch: edinburgh
source-depth: 1
plugin: dump
# NOTE - both the mongo-config & go install README.md to root-dir of the snap
......
......@@ -9,4 +9,4 @@
package edgex
// Global version for edgex-go
var Version string = "1.0.1"
var Version string = "1.0.2"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment