Commit Graph

3907 Commits

Author SHA1 Message Date
凡羊羊
fdcdd0cf90
Merge branch 'V5.1' into issue/534 2019-11-27 14:56:37 +08:00
barnettZQG
83c5d9ce46
Merge pull request #558 from fanyangyang/issue/504
update delete event process
2019-11-26 20:24:08 -06:00
barnettZQG
7c68650717
Merge pull request #557 from fanyangyang/issue/492
create service occur add env error(record already exist), recover it
2019-11-26 20:19:45 -06:00
barnettZQG
0b3efe2c77
Merge pull request #569 from GLYASAI/unkownnode
delete all keys in unkown node
2019-11-26 20:18:32 -06:00
barnettZQG
6664ca8758
Merge branch 'V5.1' into issue/504 2019-11-26 20:15:52 -06:00
glyasai
29e7785e7b Merge remote-tracking branch 'goodrain/V5.1' into unkownnode 2019-11-26 18:04:19 +08:00
barnettZQG
f419544d6b
Merge pull request #559 from fanyangyang/issue/541
update service condition when heartbeat or get node
2019-11-21 06:17:08 -06:00
barnettZQG
3a443ac007
Merge pull request #560 from fanyangyang/dockercontainerlog
fix container logConfig nil
2019-11-21 06:11:02 -06:00
凡羊羊
4e1a800c6b fix container logConfig nil 2019-11-18 10:28:00 +08:00
凡羊羊
946a1b81b0 update service condition when heartbeat or get node 2019-11-15 16:48:21 +08:00
凡羊羊
40b20f8bb1 update delete event process, use event.prevalue which has the current etcd value 2019-11-14 18:10:20 +08:00
凡羊羊
55d06ce6cb create service occur add env error(record already exist), recover it 2019-11-14 17:05:05 +08:00
凡羊羊
10c7eaf2a1 delete cert info when do not bind it 2019-11-12 20:23:46 +08:00
barnettZQG
3d16d353df
Merge pull request #531 from GLYASAI/V5.1
expected 0 arguments, got 1
2019-11-04 07:08:09 -06:00
glyasai
0d76e11680 expected 0 arguments, got 1 2019-11-04 14:08:01 +08:00
barnettZQG
5181967f47
Merge pull request #519 from fanyangyang/issue/449
fix import app error
2019-11-01 06:28:42 -05:00
barnettZQG
73e32ce824
Merge pull request #518 from fanyangyang/fix/probe
do not create default probe
2019-11-01 06:27:15 -05:00
曾庆国
d3733291b0 fix endpoint create bug 2019-10-31 17:28:37 +08:00
glyasai
da0e83850a [REV] delete all keys in unkown node 2019-10-28 17:27:39 +08:00
凡羊羊
317e1a76ed use plugin_id as map's key 2019-10-26 19:00:55 +08:00
凡羊羊
1bb26ba17e fix import app error 2019-10-26 18:18:00 +08:00
凡羊羊
930955cc6c do not create default probe 2019-10-25 19:31:52 +08:00
barnettZQG
bffee0fef2
Merge pull request #508 from GLYASAI/V5.1
[FIX] wrong server file name
2019-10-23 02:16:53 -05:00
glyasai
6336dadf7c [FIX] wrong server file name 2019-10-23 15:00:20 +08:00
barnettZQG
cd0b488ba7
Merge pull request #505 from GLYASAI/wupstream
[FIX] confused nginx upstream
2019-10-22 05:14:24 -05:00
glyasai
499bebf3fe [FIX] confused nginx upstream 2019-10-22 17:41:40 +08:00
黄润豪
32dc844b43
Merge pull request #502 from fanyangyang/issue/498
fix select available port algorithm
2019-10-21 18:20:22 +08:00
凡羊羊
8949bd1839 fix select available port algorithm 2019-10-21 16:10:36 +08:00
barnettZQG
625ec9865a
Merge pull request #501 from fanyangyang/fix/httphealthcheckbugs
http code >= 400 is not health status
2019-10-18 06:18:18 -05:00
凡羊羊
9f5702967a http code >= 400 is not health status 2019-10-18 18:53:41 +08:00
barnettZQG
848ab12e72
Merge pull request #500 from fanyangyang/fix/nodebugs
Fix/nodebugs
2019-10-18 03:28:08 -05:00
凡羊羊
f5c356c8b2 fix node bugs, use old node info and new nodestatus.NodeInfo 2019-10-18 16:06:19 +08:00
凡羊羊
d2945ed57d Merge branch 'master' of https://github.com/goodrain/rainbond 2019-10-18 10:00:08 +08:00
barnettZQG
2e19aa2ab4
Merge pull request #495 from fanyangyang/issue/462
use a new way save nginx upstream and server
2019-10-17 20:59:58 -05:00
凡羊羊
95397ea629 empty server can't use nil, use empty []*model.Server 2019-10-17 18:21:30 +08:00
凡羊羊
5ef3d61e3f use a new way save nginx upstream and server 2019-10-16 21:47:21 +08:00
曾庆国
a2680bee19 change release shell 2019-10-16 10:02:12 +08:00
barnettZQG
8ded32bcc6
Merge pull request #487 from fanyangyang/issue/462
fix proxy change not work bugs
2019-10-15 20:29:59 -05:00
barnettZQG
2673307143
Merge pull request #486 from GLYASAI/issue#451
applications with plugin backup and recovery
2019-10-15 20:28:41 -05:00
凡羊羊
c53dbb42cc fix proxy change not work bugs 2019-10-15 23:46:08 +08:00
barnettZQG
c58f4ae60a
Merge pull request #484 from fanyangyang/issue/324
update node memory when system update
2019-10-15 06:12:03 -05:00
黄润豪
4e06910ecb
Merge branch 'master' into issue#451 2019-10-15 19:07:38 +08:00
凡羊羊
dc14252ada update node memory when system update 2019-10-15 18:42:30 +08:00
glyasai
4bb8a9b37f [REV] restore with plugin info 2019-10-15 16:05:32 +08:00
barnettZQG
be5a3ec720
Merge pull request #478 from fanyangyang/fix/eventlog
do not check event saved in db or not when get event log by eventID
2019-10-14 21:04:35 -05:00
barnettZQG
7f7bf7bf98
Merge pull request #479 from fanyangyang/issue/436
update share event, add event stauts
2019-10-14 21:03:57 -05:00
glyasai
361f266902 [REV] backup plugin image 2019-10-14 15:09:32 +08:00
glyasai
660f790ffe [ADD] metadata with plugin info 2019-10-13 19:56:13 +08:00
凡羊羊
07fea34b3a update share event, add event stauts 2019-10-13 15:33:31 +08:00
凡羊羊
4647510877 do not check event saved in db or not when get event log by eventID 2019-10-12 16:55:36 +08:00