yacloud/tunasync
1
0
Fork 0
mirror of https://github.com/tuna/tunasync.git synced 2025-04-21 04:42:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature(worker): job need to be started by jobStart signal

Browse Source
This commit is contained in:
bigeagle 2016-04-28 10:44:21 +08:00
parent 13161d77cf
commit 731fba842f
No known key found for this signature in database
GPG Key ID: 9171A4571C27920A
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
worker/job.go
View File

@ -28,6 +28,7 @@ type jobMessage struct {
type mirrorJob struct {
provider mirrorProvider
ctrlChan chan ctrlAction
stopped chan empty
enabled bool
}
@ -35,7 +36,7 @@ func newMirrorJob(provider mirrorProvider) *mirrorJob {
return &mirrorJob{
provider: provider,
ctrlChan: make(chan ctrlAction, 1),
enabled: true,
enabled: false,
}
}
@ -52,6 +53,9 @@ func (m *mirrorJob) Name() string {
// TODO: message struct for managerChan
func (m *mirrorJob) Run(managerChan chan<- jobMessage, semaphore chan empty) error {
m.stopped = make(chan empty)
defer close(m.stopped)
provider := m.provider
// to make code shorter

15
worker/job_test.go
View File

@ -68,6 +68,15 @@ func TestMirrorJob(t *testing.T) {
job := newMirrorJob(provider)
go job.Run(managerChan, semaphore)
// job should not start if we don't start it
select {
case <-managerChan:
So(0, ShouldEqual, 1) // made this fail
case <-time.After(1 * time.Second):
So(0, ShouldEqual, 0)
}
job.ctrlChan <- jobStart
for i := 0; i < 2; i++ {
msg := <-managerChan
So(msg.status, ShouldEqual, PreSyncing)
@ -96,7 +105,7 @@ func TestMirrorJob(t *testing.T) {
select {
case <-managerChan:
So(0, ShouldEqual, 1) // made this fail
case <-time.After(2 * time.Second):
case <-job.stopped:
So(0, ShouldEqual, 0)
}
})
@ -118,6 +127,7 @@ echo $TUNASYNC_WORKING_DIR
Convey("If we kill it", func(ctx C) {
go job.Run(managerChan, semaphore)
job.ctrlChan <- jobStart
time.Sleep(1 * time.Second)
msg := <-managerChan
@ -135,10 +145,12 @@ echo $TUNASYNC_WORKING_DIR
So(err, ShouldBeNil)
So(string(loggedContent), ShouldEqual, exceptedOutput)
job.ctrlChan <- jobDisable
<-job.stopped
})
Convey("If we don't kill it", func(ctx C) {
go job.Run(managerChan, semaphore)
job.ctrlChan <- jobStart
msg := <-managerChan
So(msg.status, ShouldEqual, PreSyncing)
@ -156,6 +168,7 @@ echo $TUNASYNC_WORKING_DIR
So(err, ShouldBeNil)
So(string(loggedContent), ShouldEqual, exceptedOutput)
job.ctrlChan <- jobDisable
<-job.stopped
})
})