mirrors/redoctober
1
0
Fork 0
mirror of https://github.com/cloudflare/redoctober.git synced 2026-01-03 11:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Note the component that a log entry originates from.

Browse Source 
Instead of just 'init', use 'core.init' for core commands. Likewise,
in the HTTP server, note log entries originate from the server.
This commit is contained in:
Kyle Isom
2015-07-17 15:34:08 -07:00
parent e37be3a12a
commit e0e6b260a0
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/core.go
View File

@@ -171,14 +171,14 @@ func Init(path string) error {
defer func() {
if err != nil {
log.Printf("init failed: %v", err)
log.Printf("core.init failed: %v", err)
} else {
log.Printf("init success: path=%s", path)
log.Printf("core.init success: path=%s", path)
}
}()
if records, err = passvault.InitFrom(path); err != nil {
err = fmt.Errorf("Failed to load password vault %s: %s", path, err)
err = fmt.Errorf("failed to load password vault %s: %s", path, err)
}
cache = keycache.Cache{UserKeys: make(map[string]keycache.ActiveUser)}
@@ -194,9 +194,9 @@ func Create(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("create failed: user=%s %v", s.Name, err)
log.Printf("core.create failed: user=%s %v", s.Name, err)
} else {
log.Printf("create success: user=%s", s.Name)
log.Printf("core.create success: user=%s", s.Name)
}
}()
@@ -229,9 +229,9 @@ func Summary(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("summary failed: user=%s %v", s.Name, err)
log.Printf("core.summary failed: user=%s %v", s.Name, err)
} else {
log.Printf("summary success: user=%s", s.Name)
log.Printf("core.summary success: user=%s", s.Name)
}
}()
@@ -258,9 +258,9 @@ func Delegate(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("delegate failed: user=%s %v", s.Name, err)
log.Printf("core.delegate failed: user=%s %v", s.Name, err)
} else {
log.Printf("delegate success: user=%s uses=%d time=%s users=%v labels=%v", s.Name, s.Uses, s.Time, s.Users, s.Labels)
log.Printf("core.delegate success: user=%s uses=%d time=%s users=%v labels=%v", s.Name, s.Uses, s.Time, s.Users, s.Labels)
}
}()
@@ -307,9 +307,9 @@ func Password(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("password failed: user=%s %v", s.Name, err)
log.Printf("core.password failed: user=%s %v", s.Name, err)
} else {
log.Printf("password success: user=%s", s.Name)
log.Printf("core.password success: user=%s", s.Name)
}
}()
@@ -338,9 +338,9 @@ func Encrypt(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("encrypt failed: user=%s size=%d %v", s.Name, len(s.Data), err)
log.Printf("core.encrypt failed: user=%s size=%d %v", s.Name, len(s.Data), err)
} else {
log.Printf("encrypt success: user=%s size=%d", s.Name, len(s.Data))
log.Printf("core.encrypt success: user=%s size=%d", s.Name, len(s.Data))
}
}()
@@ -373,9 +373,9 @@ func Decrypt(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("decrypt failed: user=%s %v", s.Name, err)
log.Printf("core.decrypt failed: user=%s %v", s.Name, err)
} else {
log.Printf("decrypt success: user=%s", s.Name)
log.Printf("core.decrypt success: user=%s", s.Name)
}
}()
@@ -415,9 +415,9 @@ func Modify(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("modify failed: user=%s target=%s command=%s %v", s.Name, s.ToModify, s.Command, err)
log.Printf("core.modify failed: user=%s target=%s command=%s %v", s.Name, s.ToModify, s.Command, err)
} else {
log.Printf("modify success: user=%s target=%s command=%s", s.Name, s.ToModify, s.Command)
log.Printf("core.modify success: user=%s target=%s command=%s", s.Name, s.ToModify, s.Command)
}
}()
@@ -466,9 +466,9 @@ func Owners(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("owners failed: size=%d %v", len(s.Data), err)
log.Printf("core.owners failed: size=%d %v", len(s.Data), err)
} else {
log.Printf("owners success: size=%d", len(s.Data))
log.Printf("core.owners success: size=%d", len(s.Data))
}
}()
@@ -492,9 +492,9 @@ func Export(jsonIn []byte) ([]byte, error) {
defer func() {
if err != nil {
log.Printf("export failed: user=%s %v", s.Name, err)
log.Printf("core.export failed: user=%s %v", s.Name, err)
} else {
log.Printf("export success: user=%s", s.Name)
log.Printf("core.export success: user=%s", s.Name)
}
}()

6
redoctober.go
View File

@@ -134,7 +134,7 @@ func NewServer(process chan<- userRequest, staticPath, addr, certPath, keyPath,
// copy this so reference does not get overwritten
requestType := current
mux.HandleFunc(requestType, func(w http.ResponseWriter, r *http.Request) {
log.Printf("request to %s from %s", requestType, r.RemoteAddr)
log.Printf("http.server: endpoint=%s remote=%s", requestType, r.RemoteAddr)
queueRequest(process, requestType, w, r)
})
}
@@ -226,10 +226,10 @@ func main() {
if err == nil {
req.resp <- r
} else {
log.Printf("Error handling %s: %s\n", req.rt, err)
log.Printf("http.main failed: %s: %s", req.rt, err)
}
} else {
log.Printf("Unknown user request received: %s\n", req.rt)
log.Printf("http.main: request=%s function is not supported", req.rt)
}
// Note that if an error occurs no message is sent down