Skip to content

Commit 635a003

Browse files
tooroptoorop
committed
Update deps
1 parent 3821831 commit 635a003

15 files changed

+141
-27
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ tmail.zip
1919
### golang
2020
vendor/**/**/
2121

22+
dist/tmail-2019-03-17

‎cli/alias.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cli
33
import (
44
"strings"
55

6-
cgCli "github.com/codegangsta/cli"
76
"github.com/toorop/tmail/api"
7+
cgCli "github.com/urfave/cli"
88
)
99

1010
var alias = cgCli.Command{

‎cli/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cli
22

33
import (
4-
cgCli "github.com/codegangsta/cli"
4+
cgCli "github.com/urfave/cli"
55
)
66

77
// CliCommands is a slice of subcomands

‎cli/dkim.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cli
33
import (
44
"fmt"
55

6-
cgCli "github.com/codegangsta/cli"
76
"github.com/toorop/tmail/api"
7+
cgCli "github.com/urfave/cli"
88
)
99

1010
var Dkim = cgCli.Command{

‎cli/queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"os"
66
"strconv"
77

8-
cgCli "github.com/codegangsta/cli"
98
"github.com/toorop/tmail/api"
9+
cgCli "github.com/urfave/cli"
1010
)
1111

1212
var Queue = cgCli.Command{

‎cli/rcpthost.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ package cli
77
import (
88
"fmt"
99

10-
cgCli "github.com/codegangsta/cli"
1110
"github.com/toorop/tmail/api"
11+
cgCli "github.com/urfave/cli"
1212
)
1313

1414
// Rcpthost represents commands for dealing with rcpthosts

‎cli/relayip.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cli
33
import (
44
"fmt"
55

6-
cgCli "github.com/codegangsta/cli"
76
"github.com/toorop/tmail/api"
7+
cgCli "github.com/urfave/cli"
88
)
99

1010
var RelayIP = cgCli.Command{

‎cli/routes.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package cli
22

33
import (
44
"fmt"
5-
"github.com/toorop/tmail/api"
6-
cgCli "github.com/codegangsta/cli"
75
"os"
86
"strconv"
7+
8+
"github.com/toorop/tmail/api"
9+
cgCli "github.com/urfave/cli"
910
)
1011

1112
var Routes = cgCli.Command{

‎cli/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cli
22

33
import (
4-
cgCli "github.com/codegangsta/cli"
54
"github.com/toorop/tmail/api"
5+
cgCli "github.com/urfave/cli"
66
)
77

88
var user = cgCli.Command{

‎cli/utils.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package cli
22

33
import (
4-
cgCli "github.com/codegangsta/cli"
54
"os"
5+
6+
cgCli "github.com/urfave/cli"
67
)
78

89
// gotError handle error from cli

‎core/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77

88
"github.com/jinzhu/gorm"
9-
"github.com/kless/osutil/user/crypt/sha512_crypt"
9+
"github.com/tredoe/osutil/user/crypt/sha512_crypt"
1010
"golang.org/x/crypto/bcrypt"
1111
)
1212

‎go.mod

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
module github.com/toorop/tmail
2+
3+
go 1.18
4+
5+
require (
6+
github.com/boltdb/bolt v1.3.1
7+
github.com/go-sql-driver/mysql v1.6.0
8+
github.com/jinzhu/gorm v1.9.16
9+
github.com/lib/pq v1.1.1
10+
github.com/nsqio/go-nsq v1.1.0
11+
github.com/sirupsen/logrus v1.9.0
12+
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208
13+
github.com/toorop/go-sqlite3 v0.0.0-20150624184432-023bc7af3f7a
14+
github.com/toorop/gopenstack v0.0.0-20180222105328-a83d16339d49
15+
github.com/tredoe/osutil v1.0.6
16+
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd
17+
)
18+
19+
require (
20+
github.com/blang/semver v3.5.1+incompatible // indirect
21+
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
22+
github.com/codegangsta/negroni v1.0.0 // indirect
23+
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
24+
github.com/golang/snappy v0.0.1 // indirect
25+
github.com/jinzhu/inflection v1.0.0 // indirect
26+
github.com/julienschmidt/httprouter v1.3.0 // indirect
27+
github.com/nbio/httpcontext v0.0.0-20150224063329-d2f7bb023e6e // indirect
28+
github.com/nsqio/go-diskqueue v1.0.0 // indirect
29+
github.com/nsqio/nsq v1.2.1 // indirect
30+
github.com/russross/blackfriday/v2 v2.0.1 // indirect
31+
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
32+
github.com/urfave/cli v1.22.10 // indirect
33+
golang.org/x/sys v0.2.0 // indirect
34+
)

‎go.sum

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
2+
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
3+
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
4+
github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw=
5+
github.com/bitly/timer_metrics v1.0.0/go.mod h1:87z4/LSg3f++tMqZwZlsLwPuJu6xloyJ7Qm40NyEkLs=
6+
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
7+
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
8+
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b h1:AP/Y7sqYicnjGDfD5VcY4CIfh1hRXBUavxrvELjTiOE=
9+
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q=
10+
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
11+
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
12+
github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY=
13+
github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
14+
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
15+
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
16+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
17+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
18+
github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
19+
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
20+
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
21+
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
22+
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
23+
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
24+
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
25+
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
26+
github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
27+
github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
28+
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
29+
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
30+
github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
31+
github.com/judwhite/go-svc v1.2.1/go.mod h1:mo/P2JNX8C07ywpP9YtO2gnBgnUiFTHqtsZekJrUuTk=
32+
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
33+
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
34+
github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
35+
github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
36+
github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
37+
github.com/mreiferson/go-options v1.0.0/go.mod h1:zHtCks/HQvOt8ATyfwVe3JJq2PPuImzXINPRTC03+9w=
38+
github.com/nbio/httpcontext v0.0.0-20150224063329-d2f7bb023e6e h1:xvCbHT5A8/Tv15eVLfprM7nvLo/VQyx35X38RW86JVA=
39+
github.com/nbio/httpcontext v0.0.0-20150224063329-d2f7bb023e6e/go.mod h1:VR24Qkx+arWGHg5MtQ748xm0olYqbOiN35k1m1sUBaw=
40+
github.com/nsqio/go-diskqueue v1.0.0 h1:XRqpx7zTMu9yNVH+cHvA5jEiPNKoYcyEsCVqXP3eFg4=
41+
github.com/nsqio/go-diskqueue v1.0.0/go.mod h1:INuJIxl4ayUsyoNtHL5+9MFPDfSZ0zY93hNY6vhBRsI=
42+
github.com/nsqio/go-nsq v1.0.8/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
43+
github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE=
44+
github.com/nsqio/go-nsq v1.1.0/go.mod h1:vKq36oyeVXgsS5Q8YEO7WghqidAVXQlcFxzQbQTuDEY=
45+
github.com/nsqio/nsq v1.2.1 h1:ZVjANYLnX1vPLmuSNCOdiw4nNPnzWgAC4t8wFhznMqU=
46+
github.com/nsqio/nsq v1.2.1/go.mod h1:vXbwehoIygyVoX44oLFaN7MA0xrmudeuborDpMPiLTY=
47+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
48+
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
49+
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
50+
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
51+
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
52+
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
53+
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
54+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
55+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
56+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
57+
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 h1:PM5hJF7HVfNWmCjMdEfbuOBNXSVF2cMFGgQTPdKCbwM=
58+
github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
59+
github.com/toorop/go-sqlite3 v0.0.0-20150624184432-023bc7af3f7a h1:peEwdT+E1tLsiexTt+BFSfCtnjdFf9F/bJXyB3Am+bo=
60+
github.com/toorop/go-sqlite3 v0.0.0-20150624184432-023bc7af3f7a/go.mod h1:BQ0Z2Ug9aW8KJT4zMeVjEemTEkVlOWpQv+sHdjy0zvI=
61+
github.com/toorop/gopenstack v0.0.0-20180222105328-a83d16339d49 h1:tx49TfQ+FkI4KFG27OEx3gMvLWfSduEGvs3qeBOBa+4=
62+
github.com/toorop/gopenstack v0.0.0-20180222105328-a83d16339d49/go.mod h1:ZqDjWuyu5Vu4YJmhGSOAEwKdZYEZ226+wnE6lLabWsg=
63+
github.com/tredoe/fileutil v1.0.5/go.mod h1:HFzzpvg+3Q8LgmZgo1mVF5epHc/CVkWKEb3hja+/1Zo=
64+
github.com/tredoe/goutil v1.0.0/go.mod h1:Qhf75QLcNEChimbl4wb8nROzw9PCFCPYTEUmTnoszXY=
65+
github.com/tredoe/osutil v1.0.6 h1:KJvG9AFmUPLe3hsNKyPMIjNx77CkAJtMKVS4ugAT7vM=
66+
github.com/tredoe/osutil v1.0.6/go.mod h1:zNq93p2DLHJWkHi2/+zi3xOjZl8xxiv3tiI2A6zcB3w=
67+
github.com/urfave/cli v1.22.10 h1:p8Fspmz3iTctJstry1PYS3HVdllxnEzTEsgIgtxTrCk=
68+
github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
69+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
70+
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
71+
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd h1:GGJVjV8waZKRHrgwvtH66z9ZGVurTD1MT0n1Bb+q4aM=
72+
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
73+
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
74+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
75+
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
76+
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
77+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
78+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
79+
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
80+
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
81+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
82+
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
83+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
84+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
85+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
86+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
87+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎tmail.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616

1717
//"github.com/bitly/nsq/nsqd"
1818

19-
"github.com/codegangsta/cli"
2019
"github.com/nsqio/nsq/nsqd"
20+
"github.com/urfave/cli"
2121

2222
tcli "github.com/toorop/tmail/cli"
2323
"github.com/toorop/tmail/core"
@@ -121,7 +121,7 @@ func main() {
121121
opts := nsqd.NewOptions()
122122
opts.Logger = log.New(ioutil.Discard, "", 0)
123123
opts.Logger = core.NewNSQLogger()
124-
opts.Verbose = core.Cfg.GetDebugEnabled()
124+
//opts.Verbose = core.Cfg.GetDebugEnabled()
125125
opts.DataPath = core.GetBasePath() + "/nsq"
126126
// if cluster get lookupd addresses
127127
if core.Cfg.GetClusterModeEnabled() {
@@ -151,7 +151,10 @@ func main() {
151151
// Number of message in RAM before synching to disk
152152
opts.MemQueueSize = 0
153153

154-
nsqd := nsqd.New(opts)
154+
nsqd, err := nsqd.New(opts)
155+
if err != nil {
156+
log.Fatalf("ERROR: nsqd.New failed with error - %s", err.Error())
157+
}
155158
nsqd.LoadMetadata()
156159
if err = nsqd.PersistMetadata(); err != nil {
157160
log.Fatalf("ERROR: failed to persist metadata - %s", err.Error())

‎vendor/vendor.json

-13
This file was deleted.

0 commit comments

Comments
 (0)