From a25ffb1dbd08ba22a9968dee7a744bf9d23599ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 26 Jan 2017 15:28:21 +0100
Subject: [PATCH] Manager: streamlined some logging
---
.../src/flamenco-manager/flamenco/scheduler.go | 7 +++----
.../src/flamenco-manager/flamenco/task_updates.go | 11 ++++++-----
.../src/flamenco-manager/flamenco/workers.go | 5 +++--
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/scheduler.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/scheduler.go
index 97e78717..92f4c779 100644
--- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/scheduler.go
+++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/scheduler.go
@@ -33,8 +33,6 @@ func CreateTaskScheduler(config *Conf, upstream *UpstreamConnection, session *mg
}
func (ts *TaskScheduler) ScheduleTask(w http.ResponseWriter, r *auth.AuthenticatedRequest) {
- log.Infof("%s Worker %s asking for a task", r.RemoteAddr, r.Username)
-
mongo_sess := ts.session.Copy()
defer mongo_sess.Close()
db := mongo_sess.DB("")
@@ -49,6 +47,7 @@ func (ts *TaskScheduler) ScheduleTask(w http.ResponseWriter, r *auth.Authenticat
return
}
WorkerSeen(worker, r.RemoteAddr, db)
+ log.Infof("ScheduleTask: Worker %s asking for a task", worker.Identifier())
var task *Task
var was_changed bool
@@ -91,8 +90,8 @@ func (ts *TaskScheduler) ScheduleTask(w http.ResponseWriter, r *auth.Authenticat
encoder := json.NewEncoder(w)
encoder.Encode(task)
- log.Infof("%s assigned task %s to worker %s %s",
- r.RemoteAddr, task.Id.Hex(), r.Username, worker.Identifier())
+ log.Infof("ScheduleTask: assigned task %s to worker %s",
+ task.Id.Hex(), worker.Identifier())
// Push a task log line stating we've assigned this task to the given worker.
// This is done here, instead of by the worker, so that it's logged even if the worker fails.
diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/task_updates.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/task_updates.go
index b16d4ded..a003ac66 100644
--- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/task_updates.go
+++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/task_updates.go
@@ -34,18 +34,19 @@ type TaskUpdatePusher struct {
*/
func QueueTaskUpdateFromWorker(w http.ResponseWriter, r *auth.AuthenticatedRequest,
db *mgo.Database, task_id bson.ObjectId) {
- log.Infof("%s Received task update for task %s", r.RemoteAddr, task_id.Hex())
// Get the worker
worker, err := FindWorker(r.Username, bson.M{"address": 1, "nickname": 1}, db)
if err != nil {
- log.Warningf("%s QueueTaskUpdate: Unable to find worker address: %s",
- r.RemoteAddr, err)
+ log.Warningf("QueueTaskUpdate: Unable to find worker %s at address: %s",
+ r.Username, r.RemoteAddr, err)
w.WriteHeader(http.StatusForbidden)
fmt.Fprintf(w, "Unable to find worker address: %s", err)
return
}
WorkerSeen(worker, r.RemoteAddr, db)
+ log.Infof("QueueTaskUpdateFromWorker: Received task update for task %s from %s",
+ task_id.Hex(), worker.Identifier())
// Parse the task JSON
tupdate := TaskUpdate{}
@@ -126,7 +127,7 @@ func QueueTaskUpdateWithExtra(tupdate *TaskUpdate, db *mgo.Database, extra_updat
updates["activity"] = tupdate.Activity
}
if len(updates) > 0 {
- log.Infof("QueueTaskUpdate: applying update %s to task %s", updates, tupdate.TaskId.Hex())
+ log.Debugf("QueueTaskUpdate: applying update %s to task %s", updates, tupdate.TaskId.Hex())
if err := task_coll.UpdateId(tupdate.TaskId, bson.M{"$set": updates}); err != nil {
if err != mgo.ErrNotFound {
return fmt.Errorf("QueueTaskUpdate: error updating local task cache: %s", err)
@@ -237,7 +238,7 @@ func (self *TaskUpdatePusher) Go() {
// Time to push!
if update_count > 0 {
- log.Infof("TaskUpdatePusher: %d updates are queued", update_count)
+ log.Debugf("TaskUpdatePusher: %d updates are queued", update_count)
}
if err := self.push(db); err != nil {
log.Warning("TaskUpdatePusher: unable to push to upstream Flamenco Server: ", err)
diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/workers.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/workers.go
index 981c58ee..9ed8da96 100644
--- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/workers.go
+++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/workers.go
@@ -126,10 +126,9 @@ func WorkerCount(db *mgo.Database) int {
func WorkerMayRunTask(w http.ResponseWriter, r *auth.AuthenticatedRequest,
db *mgo.Database, task_id bson.ObjectId) {
- log.Infof("%s Received task update for task %s", r.RemoteAddr, task_id.Hex())
// Get the worker
- worker, err := FindWorker(r.Username, bson.M{"_id": 1, "address": 1}, db)
+ worker, err := FindWorker(r.Username, M{"_id": 1, "address": 1, "nickname": 1}, db)
if err != nil {
log.Warningf("%s WorkerMayRunTask: Unable to find worker: %s",
r.RemoteAddr, err)
@@ -138,6 +137,8 @@ func WorkerMayRunTask(w http.ResponseWriter, r *auth.AuthenticatedRequest,
return
}
WorkerSeen(worker, r.RemoteAddr, db)
+ log.Debugf("WorkerMayRunTask: %s asking if it is allowed to keep running task %s",
+ worker.Identifier(), task_id.Hex())
response := MayKeepRunningResponse{}
--
GitLab