Compare commits

...

6 Commits

Author SHA1 Message Date
bel
3c36948269 whoops cant compile 2022-01-27 07:49:46 -07:00
bel
bc2efe928a better ntg errs 2022-01-27 07:47:55 -07:00
bel
e1b4460ebd add day to log as i can only login to ntg 30 times per week it seems 2022-01-27 07:44:30 -07:00
bel
9bb9929ff6 cant edit, but on job no more, del entry 2022-01-19 06:12:13 -07:00
bel
a6c1b8505a ew at least del image 2022-01-18 14:43:04 -07:00
bel
c755aa88fb no 2022-01-18 14:41:37 -07:00
3 changed files with 11 additions and 2 deletions

View File

@@ -228,12 +228,14 @@ func setNTGToken(token string) {
func (ntg NTGVision) search(states []config.State) (io.ReadCloser, error) { func (ntg NTGVision) search(states []config.State) (io.ReadCloser, error) {
if getNTGToken() == "" { if getNTGToken() == "" {
logtr.Debugf("NTG token is empty, refreshing ntg auth")
if err := ntg.refreshAuth(); err != nil { if err := ntg.refreshAuth(); err != nil {
return nil, err return nil, err
} }
} }
rc, err := ntg._search(states) rc, err := ntg._search(states)
if err == ErrNoAuth { if err == ErrNoAuth {
logtr.Debugf("err no auth on search, refreshing ntg auth")
if err := ntg.refreshAuth(); err != nil { if err := ntg.refreshAuth(); err != nil {
return nil, err return nil, err
} }
@@ -295,7 +297,9 @@ func (ntg NTGVision) _search(states []config.State) (io.ReadCloser, error) {
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
b, _ := ioutil.ReadAll(resp.Body) b, _ := ioutil.ReadAll(resp.Body)
resp.Body.Close() resp.Body.Close()
if resp.StatusCode > 400 && resp.StatusCode < 500 && resp.StatusCode != 404 && resp.StatusCode != 410 { logtr.Debugf("ntg auth bad status: url=%s, status=%v, body=%s", request.URL.String(), resp.StatusCode, b)
if resp.StatusCode > 400 && resp.StatusCode < 404 {
logtr.Debugf("ntg auth bad status: err no auth")
return nil, ErrNoAuth return nil, ErrNoAuth
} }
return nil, fmt.Errorf("bad status searching ntg: %d: %s", resp.StatusCode, b) return nil, fmt.Errorf("bad status searching ntg: %d: %s", resp.StatusCode, b)

View File

@@ -82,7 +82,7 @@ func SetLevel(l Level) {
} }
func logf(l Level, format string, args []interface{}) { func logf(l Level, format string, args []interface{}) {
format = fmt.Sprintf("%v: %v: %s\n", time.Now().Format("15:04:05"), l.String(), strings.TrimSpace(format)) format = fmt.Sprintf("%v: %v: %s\n", time.Now().Format("01-02T15:04:05"), l.String(), strings.TrimSpace(format))
cLevel := level cLevel := level
cAnsoser := ansoser cAnsoser := ansoser
if l >= cLevel { if l >= cLevel {

View File

@@ -350,9 +350,14 @@ func updateDeadJobs(jobs []broker.Job) error {
if err := json.Unmarshal(b, &recorded); err != nil { if err := json.Unmarshal(b, &recorded); err != nil {
return err return err
} }
/* // TODO this beeps on fluffychat
if err := message.NewMatrix().Update(recorded.MatrixID, recorded.Job.FormatMultilineTextDead()); err != nil { if err := message.NewMatrix().Update(recorded.MatrixID, recorded.Job.FormatMultilineTextDead()); err != nil {
return err return err
} }
*/
if err := message.NewMatrix().Remove(recorded.MatrixID); err != nil {
return err
}
if err := db.Set(listEntry, nil); err != nil { if err := db.Set(listEntry, nil); err != nil {
return err return err
} }