diff --git a/client.go b/client.go index a3100e5..1fb8f03 100644 --- a/client.go +++ b/client.go @@ -57,10 +57,6 @@ func getLockedRandomClient() (*ChirpClient, error) { func setClientBusy(userID64 int64, from time.Time, duration time.Duration) error { if clt, ok := getLockedClient(userID64, false); ok { t := time.Now().UTC() - log.Printf("setClientBusy[%s] : now %s.\n", clt.Login, t.UTC().Format(timeFmt)) - log.Printf("setClientBusy[%s] : from %s.\n", clt.Login, from.UTC().Format(timeFmt)) - log.Printf("setClientBusy[%s] : for %s.\n", clt.Login, duration.String()) - log.Printf("setClientBusy[%s] : until %s.\n", clt.Login, from.UTC().Add(duration).Format(timeFmt)) if from.UTC().Add(duration).After(time.Now().UTC()) { clt.CWIdle = false clt.CWBusyUntil = from.UTC().Add(duration) diff --git a/cron.go b/cron.go index 24a1bbb..ed34600 100644 --- a/cron.go +++ b/cron.go @@ -6,6 +6,7 @@ import ( "time" //"github.com/robfig/cron/v3" + "github.com/tidwall/pretty" "gopkg.in/robfig/cron.v3" ) @@ -98,6 +99,17 @@ func cronSaveClients() { b, err := json.Marshal(clts) logOnError(err, "cronSaveClients : Marshal") - log.Printf("cronSaveClients : %s\n", string(b)) + + pb := pretty.Pretty(b) + log.Printf("cronSaveClients :\n%s\n", string(pb)) + + err = ioutil.WriteFile("./clients_new.json", pb, 0644) + logOnError(err, "cronSaveClients : WriteFile") + + err = os.Remove("./clients.json") + logOnError(err, "cronSaveClients : Remove") + + err = os.Rename("./clients_new.json", "./clients.json") + logOnError(err, "cronSaveClients : Rename") }