From 093d468f870a22a6cd88628981e7f427c3ac88ee Mon Sep 17 00:00:00 2001
From: bel <squeaky2x3@blapointe.com>
Date: Sat, 22 Jun 2019 14:40:57 -0600
Subject: [PATCH] monitor writes to db

Former-commit-id: 5aa70ad9d835c607abb1c19dc620f6c45d31a866
---
 main.go                                       |   5 +-
 .../.monitor_test.go.swp                      | Bin 12288 -> 12288 bytes
 monitor/monitor.go                            |   7 +--
 monitor/monitor_test.go                       |  12 ++---
 monitor/queue.go                              |  44 ++++++++++++++++--
 monitor/queue_test.go                         |   4 +-
 rssmon3.REMOVED.git-id                        |   2 +-
 server/routes.go                              |   1 +
 8 files changed, 58 insertions(+), 17 deletions(-)
 rename server/.routes.go.swp => monitor/.monitor_test.go.swp (72%)

diff --git a/main.go b/main.go
index de357c8..2e486ee 100644
--- a/main.go
+++ b/main.go
@@ -27,7 +27,10 @@ func main() {
 	}
 	go InterruptAfter(s.Run, sigc)
 
-	m := monitor.New()
+	m, err := monitor.New()
+	if err != nil {
+		panic(err)
+	}
 	go InterruptAfter(m.Run, sigc)
 
 	signal.Notify(sigc,
diff --git a/server/.routes.go.swp b/monitor/.monitor_test.go.swp
similarity index 72%
rename from server/.routes.go.swp
rename to monitor/.monitor_test.go.swp
index eea76184e10680921ae448f4f228beb505d81dee..d16c030d2456c6984bf5dc9ec90cd4b2bd94ab25 100644
GIT binary patch
literal 12288
zcmeI2UuYaf9LFbp5H~fo)CUP7OjcU<lDoaTlt4*yAt4kEZECS;71~lZyK|Sh-0q&U
zvsWZWeegki)F*|4uOh9|BKYEq2=+mQmO_11Q1GcfiYWS>*}c15(|W1+Vwr<a=Kjpi
z{O0rf%^XK|t#WpGg&uJ$1dsiM9C~lxh2qNxM$VTBSz|5r?$Ad&ZkOU@XgBf(1}r}x
zmlNTaTe0u8$|6a^I67R$A1-6jZ7)ieNVgFWAJX(N28@B-7)WKkbYzSip04Vx{+vBQ
zpE_`6H&>cI#(*(k3>X8(fH7bU7z4(DG4O~OknIujCf2eiUr&^`BlooVOVbzw#(*(k
z3>X8(fH7bU7z4(DF<=ZB1IEDr(0~^Za_2EZK6xC$<NyEN-~YcpNyuIBGx!eN0AGU7
z!F6yATm~I*3M_#IFb`^A9E<`B>;VM)wGVTF8{ix81$YN^z!|Uz=0OcS14hB0V}$$x
zegU_^XW$BW8?-?PHb4_BfGVhf32^rbLcRvq!8LFhyboRn=fEpq8teySU@sU2KkOys
z7Ptw%0v~|{2(S)Tz!Z2EjDz1su`X~M+yXbj$KXTo0eBa5Knl)-C9nYIK@E(9QDA}J
zEkeEr--1uURqz&w!EsOpPlGXFfuE4KAHfx%a(ES(hcRFb7z4(DG4Kc(*dms6j|mZr
zx?}Umk3$|cD3>gx0S_WcStOY#3#ME8YRXb(7l?)HEXhOWo^CPLcJ$K~-fHoL`EeA`
zNm{L-o9<@`CQ}jN6|d9K)nm9PSmYFFtwyVKlUVgw&?cR&(aKS@b94sH)Rg+<pC_4~
zQL}{ZayRn166M6=MS4+<c9LCM#!?)6CA$~$r8KgOG#gUKIXP3nSAM|iOi;vK=MDF)
z*GgI96x<~b5fZBrBW7Hvo`>#>scghbQH_S)26Oy%FQSubk|M3D9{rhd0V2UYnEB**
zT~8yQuHrt-emst(lj_b)jOnfxuwnwW+HRH>XFwQc*x_&@bEu+Yk(TQmQUPslJ#;+B
z^6Q7hgi^_83i2w!-Kwf8d@o^iuA~Jo)=@ZFVVu^k3$xvN$Scm_xJ0doyT{pU6zk~b
zDUTztRR!olxk~3;skg+yQNtyy#eAux-BSaZ0E{}jb4<wHRxtlb9=q`lOD4qCJ>Fsg
zl`)lqHyTW^K$(MutSqqynUhFQ$O4_;UaCq3LLaI)?-07Z@ds5|dT^yvPk1uEqzkoM
zW~b6*T_=XS36m$hL}oeE{oKVM$X>n>rvjV2R4u6B`$a#n-Bx=m9N2WY;^DSQZ=7L%
zou;cJ)<F#z?R{`xsoTy#RB{{nIoMJ4c(8-xqFJP>P`B4<Qx_}}qR%W<mfdqfS7L5H
zJ2A53uBWx%^#Mo7;O^%;7nEm0Z?E3Rsyg}^i&%$=;fWbM3;%6e?wb^xyt_F6RIdk}
zHEl2AzQcrGN1ft{s@eRI*25pwZz4?*Z>jaiiMuEo3A~=WkRS(9W7GDqM!OWOsV4N=
z_EvTV4;;(t{J`REwI6KNX2-F58Yk-S;C=O32sYtiI~I~U_|5G38(xFaF#DDve*@Zd
Bn9u+K

literal 12288
zcmeI2UuYaf9LJ|B)l{2W|Dg|s>1yj<yzbT(F`nchX`41^N=TX(ZEL%^ox5zix4X{H
zCaod<c@m{k1w|+YAABl42ttc53JMCM2>RfQBED50l=`4Z5%v3<-Md`wQqqVo#X0zN
zZ|Bc%e)FB*Z{|X0YU}=yQQq%tW%%66*b}ez9-d#fX4U%}7@HCyl`i{9;$%ylF58Sf
z3xn?N*iB{C4dbd8x-v~0akSk{g`5%6m2sv->eS=qZJ8EE0i(bQ6v$L<OaEH7ecOXN
z)$g@7^4o8lT!8`8)F@ySFbWt2i~>dhqkvJsC}0%0))i36D)t;Eaa}Qy=3o4)iudO8
zTA!!!-zZ=dFbWt2i~>dhqkvJsC}0#Y3K#{90{>?PJfE?TZeZ+{)ldQd|KI%k|JQYl
zT>=-uH{c8K2{;eVf)~N_K!Iam3LFJTzyR0`?gW>68T%c)3!VY9U=pkc*Mq;;GWI99
z1bzWOgLB|@a0<K(UILGRyTNa_F!nw84txtv0|AD>1E2(K@YBtVeFZ)Q=fQg*1be{4
zzykMxyTD&-82bTy0Nw#_fY-orFb%eW4d4#29;^es;L9GyE`Ybe8So}}0qh6&gUdHD
z_BnV9oCQyULC_B#0{4N{;Kv&o`xu-7bKnFR1^vJUW$*{q=OXwTd<H%R7r<#iYj+Bm
zk5RxVU=+A!6_{r|sUxI}r9E5bvds1O)Y&U$Z7Yfu4;o2ml}fB9jO)&r3?daqc7S*E
z?2$rcGQyWG8)y*J$Qa)^z@s4Kb12Z(d1Zj(23nwENu!J?(XeaIW8!3)Cz%=+!god@
zh1+RfxPnn&6gS(PiEOG7Xd`y5^k~QU<ncbQo>qA4(;ShC%c$NFW9Uc?2O&JDv>aMg
zOzrjsDiqCDyw$F)m|9JaKi)Q0s}+i=7E``*ZH;8wOj9C7AYO;u8Sd}xTD)uvlB4Uf
zG>%B#ouV51LfX<9iv5!%Cx5p$7ZbmtMlFT-!NaM-ve)yHqhz>ZDd=S#?G%i+x8%HN
zTg^4q&D#Wmy(OCm2#DNvGYs;PRnQR5&P;kLh@+-$DQZ%r)7my<UGREo+nEfh>5M0v
zi$U$Os-p1hP#D2K9A}ZQ^CH()I-^2O$3DfhH8#1=LbqBLRk@w=z6pJyvczjxFMF0x
zE0s9oB2D5b6$d0{h2)aFuPA>y6R9epKf|ycBX^|ZqIIQ+(AFp{$Th4)nQP6KTuWWU
z2e_9c0&~%?W$oh#>FhWT%xedh%;D}N?xFeVzO8Jg5=R%=+qS}7EtdR9J_tpz^rE`Z
zL#BEcpmC}E;Nd=+4RxGbfd~ux35}b!ydYah<GS!kn$(6c@CE;BA4FZ8NSx6uRXgHF
z5`@CGo^tvQ9dfM_Rw)U+su&Ez2_5N37Q~V>=Bep2w=7ucSfJ%XWB0D5Lj%sNFfwNI
z#oi-4O5#*`Dof!{YcH<Z)+WEgH_cdOL^9QCJ<ue7qq*ydo6wayqarWNV^!}T-2q&L
z-&I9$uD<Tk4CepX<sr`>7dl(IJ#E_r|E;&p6HJS=cX7&hrS`(QU)69;Me;G|6wD)u
zqNzAK>4d^taa3ZlQb*s&md>E>+tXg;hr&s8AQmtALv|&5k#u?WLfYl;I`L@OIkHvZ
zwT5yg5<1KgK(3brF6EL{D)Yj81&&bBJRMY5?1XrBH>C)@!si1)=vO`IFSdhLWM&>)
zY)@f6mv4`ro*c#wiYoGq_V4^qU`5knr)cfcU28I~FR<IC{D%u|s0e<G4hsuUsq>z`
zMMAl>$n+iQlRw%o#AE;HE-Zeiv{le>lHQ>qJ#_5ro+83gi-XdoBhq5{;S@{7ZN?I>
OdfdYnh$9<U?%6*XUQH?h

diff --git a/monitor/monitor.go b/monitor/monitor.go
index 89c4e00..d1d10d7 100644
--- a/monitor/monitor.go
+++ b/monitor/monitor.go
@@ -12,12 +12,13 @@ type Monitor struct {
 	config.Stoppable
 }
 
-func New() *Monitor {
+func New() (*Monitor, error) {
+	q, err := newQueue()
 	return &Monitor{
-		queue:    newQueue(),
+		queue:    q,
 		Incoming: make(chan *Item),
 		Outgoing: make(chan *Item),
-	}
+	}, err
 }
 
 func (m *Monitor) Run() error {
diff --git a/monitor/monitor_test.go b/monitor/monitor_test.go
index 6f51d16..a6ee9c9 100644
--- a/monitor/monitor_test.go
+++ b/monitor/monitor_test.go
@@ -23,7 +23,7 @@ func TestMonitorNew(t *testing.T) {
 func TestMonitorTrigger(t *testing.T) {
 	initMonitor()
 
-	m := New()
+	m, _ := New()
 	i, _ := NewItem("MonitorTrigger", time.Second)
 	i.setLast(never)
 	if time.Now().After(i.Last()) {
@@ -46,7 +46,7 @@ func TestMonitorTrigger(t *testing.T) {
 func TestMonitorTriggered(t *testing.T) {
 	initMonitor()
 
-	m := New()
+	m, _ := New()
 	i, _ := NewItem("MonitorTriggered", time.Second)
 	i.setLast(time.Now().Add(time.Hour * -1))
 	m.queue.Push(i)
@@ -64,7 +64,7 @@ func TestMonitorTriggered(t *testing.T) {
 func TestMonitorEnqueued(t *testing.T) {
 	initMonitor()
 
-	m := New()
+	m, _ := New()
 	m.Incoming = make(chan *Item, 1)
 	m.Incoming <- &Item{Key: "MonitorEnqueued"}
 
@@ -81,8 +81,8 @@ func TestMonitorEnqueued(t *testing.T) {
 func TestMonitorEnqueue(t *testing.T) {
 	initMonitor()
 
-	m := New()
-	m.enqueue(nil)
+	m, _ := New()
+	m.enqueue(&Item{})
 
 	if m.queue.Len() != 1 {
 		t.Error(m.queue.Len())
@@ -92,7 +92,7 @@ func TestMonitorEnqueue(t *testing.T) {
 func TestMonitorRun(t *testing.T) {
 	initMonitor()
 
-	m := New()
+	m, _ := New()
 	m.Outgoing = make(chan *Item, 1)
 	go m.Run()
 	defer config.Values().Can()
diff --git a/monitor/queue.go b/monitor/queue.go
index 286978f..ffef815 100644
--- a/monitor/queue.go
+++ b/monitor/queue.go
@@ -1,19 +1,55 @@
 package monitor
 
-import "github.com/golang-collections/go-datastructures/queue"
+import (
+	"local/rssmon3/config"
+	"log"
+
+	"github.com/golang-collections/go-datastructures/queue"
+)
+
+const nsQueued = "nsQueued"
 
 type Queue struct {
 	queue *queue.PriorityQueue
 }
 
-func newQueue() *Queue {
-	return &Queue{
-		queue: queue.NewPriorityQueue(1),
+func newQueue() (*Queue, error) {
+	q := queue.NewPriorityQueue(1)
+	db := config.Values().DB
+	keys, err := db.List([]string{nsQueued})
+	if err != nil {
+		return nil, err
 	}
+	for _, key := range keys {
+		b, err := db.Get(key, nsQueued)
+		if err != nil {
+			return nil, err
+		}
+		i := &Item{}
+		if err := i.Decode(b); err != nil {
+			return nil, err
+		}
+		q.Put(i)
+	}
+	return &Queue{
+		queue: q,
+	}, nil
 }
 
 func (q *Queue) Push(i *Item) {
+	if i == nil {
+		return
+	}
 	q.queue.Put(i)
+	b, err := i.Encode()
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	if err := config.Values().DB.Set(i.Key, b, nsQueued); err != nil {
+		log.Println(err)
+		return
+	}
 }
 
 func (q *Queue) Pop() *Item {
diff --git a/monitor/queue_test.go b/monitor/queue_test.go
index 167d7f7..c3bc8b6 100644
--- a/monitor/queue_test.go
+++ b/monitor/queue_test.go
@@ -12,7 +12,7 @@ func initQueue() {
 func TestQueue(t *testing.T) {
 	initQueue()
 
-	q := newQueue()
+	q, _ := newQueue()
 
 	if i := q.Peek(); i != nil {
 		t.Error(i)
@@ -33,7 +33,7 @@ func TestQueue(t *testing.T) {
 func TestQueuePriority(t *testing.T) {
 	initQueue()
 
-	q := newQueue()
+	q, _ := newQueue()
 
 	i, _ := NewItem("iQueuePriority", time.Second)
 	j, _ := NewItem("jQueuePriority", time.Hour)
diff --git a/rssmon3.REMOVED.git-id b/rssmon3.REMOVED.git-id
index 032a6b9..c5ebaf3 100644
--- a/rssmon3.REMOVED.git-id
+++ b/rssmon3.REMOVED.git-id
@@ -1 +1 @@
-0d46529517022e32f10ee1e18ee21760de34fecf
\ No newline at end of file
+cc79df3e2bb33d684975d23cd008eae93e7dffc2
\ No newline at end of file
diff --git a/server/routes.go b/server/routes.go
index e1e2113..6aee5b2 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -105,4 +105,5 @@ func (s *Server) feed(w http.ResponseWriter, r *http.Request) {
 	}
 	log.Println(i)
 	s.error(w, r, errors.New("not impl"))
+	// TODO
 }