darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove builtin log package and use standard

Browse source
This commit is contained in:
Ulrich Schreiner 2015-02-12 08:41:04 +01:00
parent cdd84eee78
commit 46251ffa92
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/handler/repo.go
View file

@ -3,11 +3,11 @@ package handler
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"log"
"net/http" "net/http"
"github.com/drone/drone/plugin/remote" "github.com/drone/drone/plugin/remote"
"github.com/drone/drone/server/datastore" "github.com/drone/drone/server/datastore"
"github.com/drone/drone/shared/build/log"
"github.com/drone/drone/shared/httputil" "github.com/drone/drone/shared/httputil"
"github.com/drone/drone/shared/model" "github.com/drone/drone/shared/model"
"github.com/drone/drone/shared/sshutil" "github.com/drone/drone/shared/sshutil"
@ -56,12 +56,12 @@ func DelRepo(c web.C, w http.ResponseWriter, r *http.Request) {
var user = ToUser(c) var user = ToUser(c)
var remote = remote.Lookup(repo.Host) var remote = remote.Lookup(repo.Host)
if remote == nil { if remote == nil {
log.Errf("no remote for host '%s' found", repo.Host) log.Printf("[ERROR] no remote for host '%s' found", repo.Host)
} else { } else {
// Request a new token and update // Request a new token and update
user_token, err := remote.GetToken(user) user_token, err := remote.GetToken(user)
if err != nil { if err != nil {
log.Errf("no token for user '%s' on remote '%s' ", repo.Host) log.Printf("[ERROR] no token for user '%s' on remote '%s' ", user.Email, repo.Host)
} else { } else {
if user_token != nil { if user_token != nil {
user.Access = user_token.AccessToken user.Access = user_token.AccessToken
@ -73,7 +73,7 @@ func DelRepo(c web.C, w http.ResponseWriter, r *http.Request) {
// and deactiveate this hook/user on the remote system // and deactiveate this hook/user on the remote system
var hook = fmt.Sprintf("%s/api/hook/%s/%s", httputil.GetURL(r), repo.Remote, repo.Token) var hook = fmt.Sprintf("%s/api/hook/%s/%s", httputil.GetURL(r), repo.Remote, repo.Token)
if err := remote.Deactivate(user, repo, hook); err != nil { if err := remote.Deactivate(user, repo, hook); err != nil {
log.Errf("deactivate on remote '%s' failed: %s", repo.Host, err) log.Printf("[ERROR] deactivate on remote '%s' failed: %s", repo.Host, err)
} }
} }
} }