Merge branch 'master' of http://119.23.72.7/sunlong_v5/go-crontab

348cc425 · 朱继来 · febb2d80 · 59ea36eb · 348cc425 · 348cc425
Commit 348cc425 authored Feb 12, 2020 by 朱继来
Showing with 75 additions and 19 deletions
go.sum
main.go
--- a/go.sum
+++ b/go.sum
@@ -9,6 +9,7 @@ github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -40,11 +41,13 @@ github.com/mongodb/mongo-go-driver v1.2.1 h1:QtCZFfMl2khU0kUNih0H1i0gxq9OO29JTTC
 github.com/mongodb/mongo-go-driver v1.2.1/go.mod h1:NK/HWDIIZkaYsnYa0hmtP443T5ELr0KDecmIioVuuyU=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
@@ -107,6 +110,7 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

--- a/main.go
+++ b/main.go
 package main
 import (
-	"os/exec"
-	"fmt"
 	"context"
+	"fmt"
+	"github.com/coreos/etcd/clientv3"
 	"time"
 )
-func main() {
+func main(){
 	var (
-		cmd *exec.Cmd
+		config clientv3.Config
-		output []byte
 		err error
+		client *clientv3.Client
+		kv clientv3.KV
+		getResp *clientv3.GetResponse
 	)
-	ctx, cancelFunc := context.WithCancel(context.TODO())
+	//配置
+	config = clientv3.Config{
+		Endpoints:[]string{"192.168.2.232:2379"},
+		DialTimeout:time.Second*5,
+	}
+	//连接 床见一个客户端
+	if client,err = clientv3.New(config);err != nil{
+		fmt.Println(err)
+		return
+	}
+	//用于读写etcd的键值对
+	kv = clientv3.NewKV(client)
+	//删除key
+	//kv.Delete(context.TODO(),"/cron/jobs/192.168.2.246/job1",clientv3.WithPrefix())
+	//kv.Delete(context.TODO(),"/cron/jobs",clientv3.WithPrefix())
+	//return
+	//新增定时任务
+	//putResp, err := kv.Put(context.TODO(),"/cron/jobs/192.168.2.246/job1","{\"name\":\"job1\",\"command\":\"D:/phpstudy/PHPTutorial/php/php-5.6.27-nts/php E:/WWW/a.php\",\"cronExpr\":\"*/7 * * * * * *\"}",clientv3.WithPrevKV())
+	//putResp, err := kv.Put(context.TODO(),"/cron/jobs/192.168.2.246/job2","{\"name\":\"job2\",\"command\":\" echo hello world\",\"cronExpr\":\"*/5 * * * * * *\"}",clientv3.WithPrevKV())
+	//putResp, err := kv.Put(context.TODO(),"/cron/jobs/192.168.2.246/job3","{\"name\":\"job3\",\"command\":\" echo hello boy\",\"cronExpr\":\"*/10 * * * * * *\"}",clientv3.WithPrevKV())
-	go func() {
+	//新增一次性任务
-		// 生成Cmd
+	//putResp, err := kv.Put(context.TODO(),"/cron/oncejobs/192.168.2.246/job10","{\"name\":\"job10\",\"command\":\" D:/phpstudy/PHPTutorial/php/php-5.6.27-nts/php E:/WWW/b.php  \"}",clientv3.WithPrevKV())
-		cmd = exec.CommandContext(ctx, "C:\\cygwin64\\bin\\bash.exe", "-c", "D:/phpstudy/PHPTutorial/php/php-5.6.27-nts/php E:/WWW/b.php")
-		fmt.Println("111111111111")
-		// 执行了命令, 捕获了子进程的输出( pipe )
+	//强杀任务
-		if output, err = cmd.CombinedOutput(); err != nil {
+	//putResp, err := kv.Put(context.TODO(),"/cron/killer/192.168.2.246/job10","")
+	if err != nil{
+		fmt.Println(err)
+	}else{
+		fmt.Println("Revision:",putResp.Header.Revision)
+		if putResp.PrevKv != nil{
+			fmt.Println("key:",string(putResp.PrevKv.Key))
+			fmt.Println("Value:",string(putResp.PrevKv.Value))
+			fmt.Println("Version:",string(putResp.PrevKv.Version))
+		}
+	}
+	//查询
+	getResp,err = kv.Get(context.TODO(),"/cron/jobs",clientv3.WithPrefix())
+	if err != nil {
 		fmt.Println(err)
 		return
 	}
-		fmt.Println(string(output))
+	for _, kvpair := range getResp.Kvs {
-	}()
+		fmt.Println(kvpair)
-	time.Sleep(time.Second*10)
+	}
-	cancelFunc()
-	fmt.Println("22222222222222222")
+	getResp,err = kv.Get(context.TODO(),"/cron/oncejobs",clientv3.WithPrefix())
-	// 打印子进程的输出
+	if err != nil {
-	time.Sleep(time.Second*1000)
+		fmt.Println(err)
+		return
+	}
+	for _, kvpair := range getResp.Kvs {
+		fmt.Println(kvpair)
+	}
 }