File tree 4 files changed +10
-3
lines changed
4 files changed +10
-3
lines changed Original file line number Diff line number Diff line change 7
7
"strings"
8
8
9
9
"github.com/nanopack/portal/balance"
10
+ "github.com/nanopack/portal/config"
10
11
"github.com/nanopack/portal/core"
11
12
"github.com/nanopack/portal/database"
12
13
"github.com/nanopack/portal/proxymgr"
@@ -320,6 +321,7 @@ func SetCert(cert core.CertBundle) error {
320
321
// save to backend
321
322
err = database .SetCert (cert )
322
323
if err != nil {
324
+ config .Log .Error ("Failed to save cert to db, undoing" )
323
325
// undo proxymgr action
324
326
if uerr := proxymgr .SetCerts (oldCerts ); uerr != nil {
325
327
err = fmt .Errorf ("%s - %s" , err , uerr )
Original file line number Diff line number Diff line change @@ -84,6 +84,7 @@ func (self Nanobox) SetCert(cert core.CertBundle) error {
84
84
// for idempotency
85
85
for i := range certs {
86
86
if certs [i ].Cert == cert .Cert && certs [i ].Key == cert .Key {
87
+ config .Log .Debug ("Cert already added, skipping" )
87
88
return nil
88
89
}
89
90
}
Original file line number Diff line number Diff line change @@ -21,6 +21,10 @@ getCurrTag() {
21
21
22
22
# build portal
23
23
echo " Building portal..."
24
+ # export GOROOT="/usr/local/go-1.7.5/"
25
+ # export PATH=/usr/local/go-1.7.5/bin:$PATH
26
+
27
+ # should be built with go1.7.x until tls regression is resolved. also https://github.com/golang/go/issues/21133
24
28
gox -ldflags=" -s -X github.com/nanopack/portal/commands.tag=$( getCurrTag)
25
29
-X github.com/nanopack/portal/commands.commit=$( getCurrCommit) " \
26
30
-osarch " linux/amd64" -output=" ./build/{{.OS}}/{{.Arch}}/portal"
Original file line number Diff line number Diff line change 159
159
"revisionTime" : " 2017-03-27T21:44:30Z"
160
160
},
161
161
{
162
- "checksumSHA1" : " xKA5NvBoR4p257SEXsEzbYKhYV0 =" ,
162
+ "checksumSHA1" : " cMjh4PqNskcfJe/i8rl0DERI8o8 =" ,
163
163
"path" : " github.com/nanobox-io/nanobox-router" ,
164
- "revision" : " 059779d975f5d9ed9913423d5e074e54edf4b501 " ,
165
- "revisionTime" : " 2017-07-03T23:17:23Z "
164
+ "revision" : " bc67ee7d4d121988c7a5163e652862978053c683 " ,
165
+ "revisionTime" : " 2017-09-08T14:48:27Z "
166
166
},
167
167
{
168
168
"checksumSHA1" : " 65+hx0QlLzpWe5pnjAzteKBnC10=" ,
You can’t perform that action at this time.
0 commit comments