Merge pull request #76 from Yuzuki616/dev

Sync

common/task/task.go

@@ -24,20 +24,24 @@ func (t *Task) hasClosed() bool {
 	return !t.running
 }
 
-func (t *Task) checkedExecute() error {
+func (t *Task) checkedExecute(first bool) error {
 	if t.hasClosed() {
 		return nil
 	}
 
 	t.access.Lock()
 	defer t.access.Unlock()
-
+	if first {
+		if err := t.Execute(); err != nil {
+			t.running = false
+			return err
+		}
+	}
 	if !t.running {
 		return nil
 	}
-
 	t.timer = time.AfterFunc(t.Interval, func() {
-		t.checkedExecute()
+		t.checkedExecute(true)
 	})
 
 	return nil
@@ -52,21 +56,12 @@ func (t *Task) Start(first bool) error {
 	}
 	t.running = true
 	t.access.Unlock()
-	if first {
-		if err := t.Execute(); err != nil {
+	if err := t.checkedExecute(first); err != nil {
 		t.access.Lock()
 		t.running = false
 		t.access.Unlock()
 		return err
 	}
-	}
-	if err := t.checkedExecute(); err != nil {
-		t.access.Lock()
-		t.running = false
-		t.access.Unlock()
-		return err
-	}
-
 	return nil
 }
 

common/task/task_test.go

@@ -0,0 +1,15 @@
+package task
+
+import (
+	"log"
+	"testing"
+	"time"
+)
+
+func TestTask(t *testing.T) {
+	ts := Task{Execute: func() error {
+		log.Println("q")
+		return nil
+	}, Interval: time.Second}
+	ts.Start(false)
+}

node/controller.go

@@ -63,7 +63,7 @@ func (c *Controller) Start() error {
 			return fmt.Errorf("update rule error: %s", err)
 		}
 	}
-	if c.nodeInfo.Tls {
+	if c.nodeInfo.Tls || c.nodeInfo.Type == "hysteria" {
 		err = c.requestCert()
 		if err != nil {
 			return fmt.Errorf("request cert error: %s", err)

node/lego/lego.go

@@ -16,7 +16,8 @@ type Lego struct {
 }
 
 func New(config *conf.CertConfig) (*Lego, error) {
-	user, err := NewUser(path.Join("/etc/V2bX/cert/user/",
+	user, err := NewUser(path.Join(path.Dir(config.CertFile),
+		"user",
 		fmt.Sprintf("user-%s.json", config.Email)),
 		config.Email)
 	if err != nil {

node/task.go

@@ -67,7 +67,7 @@ func (c *Controller) nodeInfoMonitor() (err error) {
 			log.Print(err)
 			return nil
 		}
-		if newNodeInfo.Tls {
+		if c.nodeInfo.Tls || c.nodeInfo.Type == "hysteria" {
 			err = c.requestCert()
 			if err != nil {
 				return fmt.Errorf("request cert error: %s", err)