diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/documents.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/documents.go index 46ae3b5ab929a60706cb98aec08368cc513198fd..047ac4f10eaf97e5df58be86c7843d2a62420cfe 100644 --- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/documents.go +++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/documents.go @@ -105,7 +105,7 @@ type MayKeepRunningResponse struct { // Settings we want to be able to update from within Flamenco Manager itself, // so those are stored in MongoDB itself. type SettingsInMongo struct { - DepsgraphLastModified *time.Time `bson:"depsgraph_last_modified"` + DepsgraphLastModified *string `bson:"depsgraph_last_modified"` } type StatusReport struct { diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go index c4e78d9db8e379d3627208d6a9d862e902a9a834..b50dfcdd9183fa41d1c4b4697757220ca89713ed 100644 --- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go +++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go @@ -158,9 +158,8 @@ func download_tasks_from_upstream(config *Conf, mongo_sess *mgo.Session) { settings := GetSettings(db) if settings.DepsgraphLastModified != nil { log.Infof("Getting tasks from upstream Flamenco %s If-Modified-Since %s", get_url, - settings.DepsgraphLastModified) - req.Header.Set("If-Modified-Since", - settings.DepsgraphLastModified.Format(LastModifiedHeaderFormat)) + *settings.DepsgraphLastModified) + req.Header.Set("If-Modified-Since", *settings.DepsgraphLastModified) } else { log.Infof("Getting tasks from upstream Flamenco %s", get_url) } @@ -227,12 +226,8 @@ func download_tasks_from_upstream(config *Conf, mongo_sess *mgo.Session) { last_modified := resp.Header.Get("Last-Modified") if last_modified != "" { log.Info("Last modified task was at ", last_modified) - if parsed, err := time.Parse(LastModifiedHeaderFormat, last_modified); err != nil { - log.Errorf("Unable to parse Last-Modified header: ", err) - } else { - settings.DepsgraphLastModified = &parsed - SaveSettings(db, settings) - } + settings.DepsgraphLastModified = &last_modified + SaveSettings(db, settings) } }