支持用ssl证书访问etcd

README.md

@@ -4,6 +4,10 @@
 
 [简体中文](README_ZH.md)
 
+## 新增支持
+- 通过ssl证书访问etcd
+- 支持将节点作为kubernetes pod动态上下线
+
 ## Purpose
 
 The goal of this project is to make it much easier to manage jobs on lots of machines and provides high availability.

README_ZH.md

@@ -1,5 +1,6 @@
 # cronsun [![Build Status](https://travis-ci.org/shunfei/cronsun.svg?branch=master)](https://travis-ci.org/shunfei/cronsun)
 
+
 `cronsun` 是一个分布式任务系统，单个结点和 `*nix` 机器上的 `crontab` 近似。支持界面管理机器上的任务，支持任务失败邮件提醒，安装简单，使用方便，是替换 `crontab` 一个不错的选择。
 
 `cronsun` 是为了解决多台 `*nix` 机器上`crontab` 任务管理不方便的问题，同时提供任务高可用的支持（当某个节点死机的时候可以自动调度到正常的节点执行）。`cronsun` 和 [Azkaban](https://azkaban.github.io/)、[Chronos](https://mesos.github.io/chronos/)、[Airflow](https://airflow.incubator.apache.org/) 这些不是同一类型的。
@@ -12,7 +13,8 @@
 
 
 ## 特性
-
+- 新增通过ssl证书访问etcd
+- 支持将节点作为kubernetes pod动态上下线
 - 方便对多台服务器上面的定时任务进行集中式管理
 - 任务调度时间粒度支持到`秒`级别
 - 任务失败自动重试

conf/conf.go

@@ -3,6 +3,7 @@ package conf
 import (
  "errors"
  "fmt"
+ "github.com/coreos/etcd/pkg/transport"
  "io/ioutil"
  "os"
  "path"
@@ -81,9 +82,14 @@ type Conf struct {
 }
 
 type etcdConfig struct {
- Endpoints []string
- Username string
- Password string
+ Endpoints []string
+ Username string
+ Password string
+
+ CertFile string
+ KeyFile string
+ TrustedCAFile string
+
  DialTimeout int64 // 单位秒
 
  conf client.Config
@@ -202,6 +208,14 @@ func (c *Conf) parse(confFile string) error {
  c.Etcd.conf.Username = c.Etcd.Username
  c.Etcd.conf.Password = c.Etcd.Password
  c.Etcd.conf.Endpoints = c.Etcd.Endpoints
+ if c.Etcd.CertFile != "" && c.Etcd.TrustedCAFile != "" && c.Etcd.KeyFile != "" {
+ tlsInfo := transport.TLSInfo{
+ CertFile: c.Etcd.CertFile,
+ KeyFile: c.Etcd.KeyFile,
+ TrustedCAFile: c.Etcd.TrustedCAFile,
+ }
+ c.Etcd.conf.TLS, _ = tlsInfo.ClientConfig()
+ }
 
  if c.Ttl <= 0 {
  c.Ttl = 10

conf/files/db.json.sample

@@ -5,7 +5,7 @@
  "Database": "cronsun",
  "#AuthSource": "AuthSource Specify the database name associated with the user’s credentials.",
  "#AuthSource": "AuthSource defaults to the cronsun's Database.",
- "#AuthSource": "If connect mongodb like './bin/mongo mytest -u "test" -p "123" --authenticationDatabase admin' ,",
+ "#AuthSource": "If connect mongodb like './bin/mongo mytest -u test -p 123 --authenticationDatabase admin' ",
  "#AuthSource": "the AuthSource is 'admin'. ",
  "AuthSource": "",
  "UserName": "",

conf/files/etcd.json.sample

@@ -4,6 +4,9 @@
  ],
  "Username":"",
  "Password":"",
- "#DialTimeout":"单位秒",
+ "CertFile":"",
+ "KeyFile":"m",
+ "TrustedCAFile":"", 
+ "#DialTimeout":"单位秒",
  "DialTimeout": 2
 }

go.mod

@@ -18,7 +18,6 @@ require (
  github.com/gogo/protobuf v1.1.1 // indirect
  github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
  github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
- github.com/golang/protobuf v1.2.0 // indirect
  github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c // indirect
  github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c // indirect
  github.com/gorilla/context v1.1.1 // indirect
@@ -29,7 +28,10 @@ require (
  github.com/inconshreveable/mousetrap v1.0.0 // indirect
  github.com/jonboulle/clockwork v0.1.0 // indirect
  github.com/jtolds/gls v4.2.1+incompatible // indirect
+ github.com/kr/pretty v0.1.0 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/onsi/ginkgo v1.10.1 // indirect
+ github.com/onsi/gomega v1.7.0 // indirect
  github.com/pkg/errors v0.8.0 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/prometheus/client_golang v0.8.0 // indirect
@@ -50,11 +52,16 @@ require (
  go.uber.org/atomic v1.3.2 // indirect
  go.uber.org/multierr v1.1.0 // indirect
  go.uber.org/zap v1.9.1
- golang.org/x/net v0.0.0-20180826012351-8a410e7b638d // indirect
- golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 // indirect
- golang.org/x/text v0.3.0 // indirect
+ golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 // indirect
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
+ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
  google.golang.org/genproto v0.0.0-20180831171423-11092d34479b // indirect
  google.golang.org/grpc v1.14.0 // indirect
+ gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
  gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+ gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
+ gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
  gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce
+ gopkg.in/yaml.v2 v2.2.2 // indirect
 )

go.sum

@@ -6,7 +6,7 @@ github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 h1:dzj1/xcivGjNPw
 github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292/go.mod h1:qRiX68mZX1lGBkTWyp3CLcenw9I94W2dLeRvMzcn9N4=
 github.com/coreos/bbolt v1.3.0 h1:HIgH5xUWXT914HCI671AxuTTqjj64UOFr7pHn48LUTI=
 github.com/coreos/bbolt v1.3.0/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-github.com/coreos/etcd v3.3.9+incompatible h1:/pWnp1yEff0z+vBEOBFLZZ22Ux5xoVozEe7X0VFyRNo=
+github.com/coreos/etcd v3.3.9+incompatible h1:iKSVPXGNGqroBx4+RmUXv8emeU7y+ucRZSzTYgzLZwM=
 github.com/coreos/etcd v3.3.9+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -48,14 +48,26 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92Bcuy
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.4.1 h1:pX7cnDwSSmG0dR9yNjCQSSpmsJOqFdT7SzVp5Yl9uVw=
 github.com/grpc-ecosystem/grpc-gateway v1.4.1/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -96,17 +108,44 @@ go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 h1:Gv7RPwsi3eZ2Fgewe3CBsuOebPwO27PoXzRpJPsvSSM=
+golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b h1:lohp5blsw53GBXtLyLNaTXPXS9pJ1tiTw61ZHUoE9Qw=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/grpc v1.14.0 h1:ArxJuB1NWfPY6r9Gp9gqwplT0Ge7nqv9msgu03lHLmo=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

id.go

@@ -15,5 +15,5 @@ func initID() (err error) {
 
 func NextID() string {
  id := generator.Next()
- return hex.EncodeToString(id[:4])
+ return hex.EncodeToString(id[:])
 }

job.go

@@ -155,7 +155,7 @@ func (c *Cmd) Run() {
  return
  }
 
- for i := 0; i < c.Job.Retry; i++ {
+ for i := 0; i <= c.Job.Retry; i++ {
  if c.Job.Run() {
  return
  }

node/node.go

@@ -58,7 +58,7 @@ func NewNode(cfg *conf.Conf) (n *Node, err error) {
  n = &Node{
  Client: cronsun.DefalutClient,
  Node: &cronsun.Node{
- ID: uuid,
+ ID: hostname,
  PID: strconv.Itoa(os.Getpid()),
  PIDFile: strings.TrimSpace(cfg.PIDFile),
  IP: ip.String(),
@@ -387,6 +387,7 @@ func (n *Node) groupAddNode(g *cronsun.Group) {
  }
 
  job.Init(n.ID, n.Hostname, n.IP)
+ n.jobs[jid] = job
  }
 
  cmds := job.Cmds(n.ID, n.groups)

version.go

@@ -5,7 +5,7 @@ import (
  "runtime"
 )
 
-const VersionNumber = "0.3.4"
+const VersionNumber = "0.3.5"
 
 var (
  Version = fmt.Sprintf("v%s (build %s)", VersionNumber, runtime.Version())

web/ui/src/components/Job.vue

@@ -48,7 +48,7 @@
  <div class="ui icon dropdown" v-show="!batched">
  <i class="content icon"></i>
  <div class="menu">
- <div class="item" v-on:click="$router.push('/job/edit/'+job.group+'/'+job.id)">{{$L('edit')}}</div>
+ <div class="item" v-on:click="editJob(job.group, job.id)">{{$L('edit')}}</div>
  <div class="item" v-if="job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('open')}}</div>
  <div class="item" v-if="!job.pause" v-on:click="changeStatus(job.group, job.id, index, !job.pause)">{{$L('pause')}}</div>
  <div class="divider"></div>
@@ -62,7 +62,7 @@
  <td class="center aligned"><i class="icon" v-bind:class="{pause: job.pause, play: !job.pause, green: !job.pause}"></i></td>
  <td>{{job.group}}</td>
  <td>{{job.user && job.user.length > 0 ? job.user : '-'}}</td>
- <td><router-link :to="'/job/edit/'+job.group+'/'+job.id">{{job.name}}</router-link></td>
+ <td><router-link :to="buildEditJobURL(job.group, job.id)">{{job.name}}</router-link></td>
  <td>
  <span v-if="!job.latestStatus">-</span>
  <span v-else>{{formatLatest(job.latestStatus)}}</span>
@@ -165,6 +165,19 @@ export default {
  this.fetchList(this.buildQuery());
  },
 
+ editJob: function(group, id){
+ this.$router.push( this.buildEditJobURL(group, id) );
+ },
+
+ buildEditJobURL: function(group, id){
+ var query = this.buildQuery();
+ if(query == ''){
+ return '/job/edit/'+group+'/'+id;
+ }else{
+ return '/job/edit/'+group+'/'+id+ '?'+query;
+ }
+ },
+
  removeJob: function(group, id, index){
  var vm = this;
  this.$rest.DELETE('job/'+group+'-'+id).onsucceed(204, (resp)=>{

web/ui/src/components/JobEditForm.vue

@@ -174,7 +174,7 @@ export default {
  this.loading = true;
  var vm = this;
  this.$rest.PUT('job', this.job)
- .onsucceed(exceptCode, ()=>{vm.$router.push('/job')})
+ .onsucceed(exceptCode, ()=>{vm.$router.push({path:'/job',query:vm.$route.query})})
  .onfailed((resp)=>{vm.$bus.$emit('error', resp)})
  .onend(()=>{vm.loading=false})
  .do();

web/ui/src/main.js

@@ -46,6 +46,19 @@ var restApi = new Rest('/v1/', (msg) => {
  bus.$emit('goLogin')
  }
 });
+var loadNodes = function(resolve) {
+ restApi.GET('nodes').onsucceed(200, (resp) => {
+ var nodes = {};
+ for (var i in resp) {
+ nodes[resp[i].id] = resp[i];
+ }
+ store.commit('setNodes', nodes);
+ if(typeof resolve == "function"){
+ resolve();
+ }
+ }).do();
+}
+
 Vue.use((Vue, options) => {
  Vue.prototype.$rest = restApi;
 }, null);
@@ -60,6 +73,8 @@ Vue.use((Vue) => {
  }
  Vue.use(Config);
  bus.$emit('conf_loaded', resp);
+ loadNodes();
+
  }).onfailed((data, xhr) => {
  var msg = data ? data : xhr.status + ' ' + xhr.statusText;
  bus.$emit('error', msg);
@@ -132,18 +147,7 @@ var initConf = new Promise((resolve) => {
  restApi.GET('configurations').onsucceed(200, (resp) => {
  Vue.use((Vue) => Vue.prototype.$appConfig = resp);
  bus.$emit('conf_loaded', resp);
-
- var loadNodes = function() {
- restApi.GET('nodes').onsucceed(200, (resp) => {
- var nodes = {};
- for (var i in resp) {
- nodes[resp[i].id] = resp[i];
- }
- store.commit('setNodes', nodes);
- resolve();
- }).do();
- }
- loadNodes();
+ loadNodes(resolve);
  setInterval(loadNodes, 60*1000);
 
  }).onfailed((data, xhr) => {