From 7d19a312eb7ec56689ffcfe99ab150ab5efc4dce Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Wed, 14 Feb 2018 03:22:16 +0400 Subject: [PATCH] Updated mogrus, new remote on source.wtfteam.pro --- Gopkg.lock | 32 ++++++++++++++++++------------ Gopkg.toml | 22 +++++++++++++++----- api/exported.go | 4 ++-- api/fetch_request/exported.go | 2 +- cmd/wind8_fetcher/wind8_fetcher.go | 4 ++-- lib/appcontext/appcontext.go | 8 ++++---- lib/config/config.go | 2 +- 7 files changed, 46 insertions(+), 28 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e103bf6..64d2685 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -4,48 +4,54 @@ [[projects]] name = "github.com/sirupsen/logrus" packages = ["."] - revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e" - version = "v1.0.3" + revision = "d682213848ed68c0a260ca37d6dd5ace8423f5ba" + version = "v1.0.4" [[projects]] branch = "master" name = "golang.org/x/crypto" packages = ["ssh/terminal"] - revision = "2509b142fb2b797aa7587dad548f113b2c0f20ce" + revision = "3a6c3ce65c4f0844ac396b02aebda1496fd2ac9d" [[projects]] branch = "master" name = "golang.org/x/net" - packages = ["html","html/atom"] - revision = "7b572d500b0702f1ea30a47083ce2e1e5c61edba" + packages = [ + "html", + "html/atom" + ] + revision = "f5dfe339be1d06f81b22525fe34671ee7d2c8904" [[projects]] branch = "master" name = "golang.org/x/sys" - packages = ["unix","windows"] - revision = "164713f0dfcec4e80be8b53e1f0811f5f0d84578" + packages = [ + "unix", + "windows" + ] + revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd" [[projects]] branch = "v2" name = "gopkg.in/yaml.v2" packages = ["."] - revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f" + revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4" [[projects]] branch = "master" - name = "lab.pztrn.name/golibs/flagger" + name = "source.pztrn.name/golibs/flagger" packages = ["."] - revision = "b1abee64b9076d189411e666a4c141176bc007f7" + revision = "c9b4726e1787adb01126cdf9a7932e2bccbb51a7" [[projects]] branch = "master" - name = "lab.pztrn.name/golibs/mogrus" + name = "source.pztrn.name/golibs/mogrus" packages = ["."] - revision = "bdf5f86147cf30852a0e7d03613ca71f6851e747" + revision = "2e3a9d38c8e4b0036f714f88ef0fe9fc14b4c6b8" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "0168622020563ff2d9261221f045328fa18a0961e7a613a5a5a4a212c24f2b51" + inputs-digest = "d71dfdedcb7e98a5a710ecf4ae73a0adfbea0a030f8119908bc141b91d44a17e" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 3c4fe16..95b5a33 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,4 +1,3 @@ - # Gopkg.toml example # # Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md @@ -17,18 +16,31 @@ # source = "github.com/myfork/project2" # # [[override]] -# name = "github.com/x/y" -# version = "2.4.0" +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true +[[constraint]] + branch = "master" + name = "golang.org/x/net" + [[constraint]] branch = "v2" name = "gopkg.in/yaml.v2" [[constraint]] branch = "master" - name = "lab.pztrn.name/golibs/mogrus" + name = "source.pztrn.name/golibs/flagger" [[constraint]] branch = "master" - name = "lab.pztrn.name/golibs/flagger" + name = "source.pztrn.name/golibs/mogrus" + +[prune] + go-tests = true + unused-packages = true diff --git a/api/exported.go b/api/exported.go index 4b7d544..d52f526 100644 --- a/api/exported.go +++ b/api/exported.go @@ -2,10 +2,10 @@ package api import ( // local - "lab.pztrn.name/fat0troll/wind8_fetcher/lib/appcontext" + "source.wtfteam.pro/wind8/wind8_fetcher/lib/appcontext" // actions - "lab.pztrn.name/fat0troll/wind8_fetcher/api/fetch_request" + "source.wtfteam.pro/wind8/wind8_fetcher/api/fetch_request" ) var ( diff --git a/api/fetch_request/exported.go b/api/fetch_request/exported.go index 0e69fb0..8a0d9e2 100644 --- a/api/fetch_request/exported.go +++ b/api/fetch_request/exported.go @@ -2,7 +2,7 @@ package fetchrequest import ( // local - "lab.pztrn.name/fat0troll/wind8_fetcher/lib/appcontext" + "source.wtfteam.pro/wind8/wind8_fetcher/lib/appcontext" ) var ( diff --git a/cmd/wind8_fetcher/wind8_fetcher.go b/cmd/wind8_fetcher/wind8_fetcher.go index cafdd8d..10216fe 100644 --- a/cmd/wind8_fetcher/wind8_fetcher.go +++ b/cmd/wind8_fetcher/wind8_fetcher.go @@ -2,8 +2,8 @@ package main import ( // local - "lab.pztrn.name/fat0troll/wind8_fetcher/api" - "lab.pztrn.name/fat0troll/wind8_fetcher/lib/appcontext" + "source.wtfteam.pro/wind8/wind8_fetcher/api" + "source.wtfteam.pro/wind8/wind8_fetcher/lib/appcontext" ) func main() { diff --git a/lib/appcontext/appcontext.go b/lib/appcontext/appcontext.go index e69c788..4469b87 100644 --- a/lib/appcontext/appcontext.go +++ b/lib/appcontext/appcontext.go @@ -6,10 +6,10 @@ import ( "net/http" "os" // 3rd-party - "lab.pztrn.name/golibs/flagger" - "lab.pztrn.name/golibs/mogrus" + "source.pztrn.name/golibs/flagger" + "source.pztrn.name/golibs/mogrus" // local - "lab.pztrn.name/fat0troll/wind8_fetcher/lib/config" + "source.wtfteam.pro/wind8/wind8_fetcher/lib/config" ) // Context is an application context struct @@ -25,7 +25,7 @@ func (c *Context) Init() { l := mogrus.New() l.Initialize() c.Log = l.CreateLogger("stdout") - c.Log.CreateOutput("stdout", os.Stdout, true) + c.Log.CreateOutput("stdout", os.Stdout, true, "debug") c.Cfg = config.New() diff --git a/lib/config/config.go b/lib/config/config.go index 10612e6..786ce84 100644 --- a/lib/config/config.go +++ b/lib/config/config.go @@ -6,7 +6,7 @@ import ( "path/filepath" // 3rd-party "gopkg.in/yaml.v2" - "lab.pztrn.name/golibs/mogrus" + "source.pztrn.name/golibs/mogrus" ) // HTTPServerConfiguration handles HTTP server configuration in config file