From 2a7a112bbffcd41a3436c086f1910ea7a9c94744 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 5 Jan 2018 14:59:03 +0100 Subject: Migration to AGL gerrit (update go import) Signed-off-by: Sebastien Douheret --- lib/xdsserver/apiv1-config.go | 6 +++--- lib/xdsserver/apiv1-events.go | 6 +++--- lib/xdsserver/apiv1-exec.go | 8 ++++---- lib/xdsserver/apiv1-folders.go | 6 +++--- lib/xdsserver/apiv1-make.go | 4 ++-- lib/xdsserver/apiv1-sdks.go | 6 +++--- lib/xdsserver/apiv1-version.go | 4 ++-- lib/xdsserver/apiv1.go | 2 +- lib/xdsserver/events.go | 4 ++-- lib/xdsserver/folder-interface.go | 4 ++-- lib/xdsserver/folder-pathmap.go | 6 +++--- lib/xdsserver/folder-st-disable.go | 4 ++-- lib/xdsserver/folder-st.go | 6 +++--- lib/xdsserver/folders.go | 8 ++++---- lib/xdsserver/sdk.go | 8 ++++---- lib/xdsserver/sdks.go | 6 +++--- lib/xdsserver/sessions.go | 8 ++++---- lib/xdsserver/webserver.go | 4 ++-- lib/xdsserver/xdsserver.go | 9 ++++----- 19 files changed, 54 insertions(+), 55 deletions(-) (limited to 'lib/xdsserver') diff --git a/lib/xdsserver/apiv1-config.go b/lib/xdsserver/apiv1-config.go index 23b299b..3bb58e4 100644 --- a/lib/xdsserver/apiv1-config.go +++ b/lib/xdsserver/apiv1-config.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,9 +21,9 @@ import ( "net/http" "sync" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) var confMut sync.Mutex diff --git a/lib/xdsserver/apiv1-events.go b/lib/xdsserver/apiv1-events.go index eedd747..e2b0133 100644 --- a/lib/xdsserver/apiv1-events.go +++ b/lib/xdsserver/apiv1-events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package xdsserver import ( "net/http" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // eventsList Registering for events that will be send over a WS diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go index bc45fdb..2337de6 100644 --- a/lib/xdsserver/apiv1-exec.go +++ b/lib/xdsserver/apiv1-exec.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,10 +26,10 @@ import ( "strings" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-common/golib/eows" - "github.com/iotbzh/xds-server/lib/xsapiv1" "github.com/kr/pty" ) diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go index a395b80..cb03175 100644 --- a/lib/xdsserver/apiv1-folders.go +++ b/lib/xdsserver/apiv1-folders.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package xdsserver import ( "net/http" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getFolders returns all folders configuration diff --git a/lib/xdsserver/apiv1-make.go b/lib/xdsserver/apiv1-make.go index ef2e331..226561b 100644 --- a/lib/xdsserver/apiv1-make.go +++ b/lib/xdsserver/apiv1-make.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,8 +18,8 @@ package xdsserver import ( + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" ) /* Deprecated command - should be removed */ diff --git a/lib/xdsserver/apiv1-sdks.go b/lib/xdsserver/apiv1-sdks.go index e69b82d..7bb9767 100644 --- a/lib/xdsserver/apiv1-sdks.go +++ b/lib/xdsserver/apiv1-sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package xdsserver import ( "net/http" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getSdks returns all SDKs configuration diff --git a/lib/xdsserver/apiv1-version.go b/lib/xdsserver/apiv1-version.go index e3a238a..754310a 100644 --- a/lib/xdsserver/apiv1-version.go +++ b/lib/xdsserver/apiv1-version.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,8 +20,8 @@ package xdsserver import ( "net/http" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getInfo : return various information about server diff --git a/lib/xdsserver/apiv1.go b/lib/xdsserver/apiv1.go index f9d5948..67d09b5 100644 --- a/lib/xdsserver/apiv1.go +++ b/lib/xdsserver/apiv1.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xdsserver/events.go b/lib/xdsserver/events.go index 007b89a..4ae1ff3 100644 --- a/lib/xdsserver/events.go +++ b/lib/xdsserver/events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" ) // EventDef Definition on one event diff --git a/lib/xdsserver/folder-interface.go b/lib/xdsserver/folder-interface.go index 151530c..18cdb54 100644 --- a/lib/xdsserver/folder-interface.go +++ b/lib/xdsserver/folder-interface.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,7 +17,7 @@ package xdsserver -import "github.com/iotbzh/xds-server/lib/xsapiv1" +import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" type FolderEventCBData map[string]interface{} type FolderEventCB func(cfg *xsapiv1.FolderConfig, data *FolderEventCBData) diff --git a/lib/xdsserver/folder-pathmap.go b/lib/xdsserver/folder-pathmap.go index 0452b13..8024331 100644 --- a/lib/xdsserver/folder-pathmap.go +++ b/lib/xdsserver/folder-pathmap.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ import ( "path/filepath" "strings" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/xdsserver/folder-st-disable.go b/lib/xdsserver/folder-st-disable.go index c52854d..f5e19d8 100644 --- a/lib/xdsserver/folder-st-disable.go +++ b/lib/xdsserver/folder-st-disable.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,7 @@ package xdsserver import ( - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/xdsserver/folder-st.go b/lib/xdsserver/folder-st.go index 9cbb570..9c89700 100644 --- a/lib/xdsserver/folder-st.go +++ b/lib/xdsserver/folder-st.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,8 +23,8 @@ import ( "path/filepath" "strings" - st "github.com/iotbzh/xds-server/lib/syncthing" - "github.com/iotbzh/xds-server/lib/xsapiv1" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" "github.com/syncthing/syncthing/lib/config" ) diff --git a/lib/xdsserver/folders.go b/lib/xdsserver/folders.go index 93d2898..fa24878 100644 --- a/lib/xdsserver/folders.go +++ b/lib/xdsserver/folders.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,10 +26,10 @@ import ( "strings" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/franciscocpg/reflectme" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xdsconfig" - "github.com/iotbzh/xds-server/lib/xsapiv1" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/xdsserver/sdk.go b/lib/xdsserver/sdk.go index e5d4d7c..90dae19 100644 --- a/lib/xdsserver/sdk.go +++ b/lib/xdsserver/sdk.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,10 +27,10 @@ import ( "strings" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/Sirupsen/logrus" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-common/golib/eows" - "github.com/iotbzh/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/xdsserver/sdks.go b/lib/xdsserver/sdks.go index b7f7e2e..a18d94f 100644 --- a/lib/xdsserver/sdks.go +++ b/lib/xdsserver/sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ import ( "strings" "sync" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" ) // SDKs List of installed SDK diff --git a/lib/xdsserver/sessions.go b/lib/xdsserver/sessions.go index f7ce846..69fe819 100644 --- a/lib/xdsserver/sessions.go +++ b/lib/xdsserver/sessions.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/googollee/go-socket.io" + socketio "github.com/googollee/go-socket.io" uuid "github.com/satori/go.uuid" "github.com/syncthing/syncthing/lib/sync" ) @@ -217,8 +217,8 @@ func (s *Sessions) monitorSessMap() { s.Log.Debugln("Stop monitorSessMap") return case <-time.After(sessionMonitorTime * time.Second): - s.LogSillyf("Sessions Map size: %d", len(s.sessMap)) - s.LogSillyf("Sessions Map : %v", s.sessMap) + s.LogSillyf("Sessions Map size: %d", len(s.sessMap)) + s.LogSillyf("Sessions Map : %v", s.sessMap) if len(s.sessMap) > maxSessions { s.Log.Errorln("TOO MUCH sessions, cleanup old ones !") diff --git a/lib/xdsserver/webserver.go b/lib/xdsserver/webserver.go index 27b212b..f1c88d2 100644 --- a/lib/xdsserver/webserver.go +++ b/lib/xdsserver/webserver.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,7 +28,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/gin-contrib/static" "github.com/gin-gonic/gin" - "github.com/googollee/go-socket.io" + socketio "github.com/googollee/go-socket.io" ) // WebServer . diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go index 46e860b..bb8f755 100644 --- a/lib/xdsserver/xdsserver.go +++ b/lib/xdsserver/xdsserver.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,12 +26,11 @@ import ( "syscall" "time" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - "github.com/iotbzh/xds-server/lib/xsapiv1" - - "github.com/iotbzh/xds-server/lib/syncthing" - "github.com/iotbzh/xds-server/lib/xdsconfig" ) const cookieMaxAge = "3600" -- cgit 1.2.3-korg