Skip to content
This repository has been archived by the owner on Sep 25, 2023. It is now read-only.

2.x #813

Open
wants to merge 90 commits into
base: master
Choose a base branch
from
Open

2.x #813

wants to merge 90 commits into from

Conversation

nugula
Copy link

@nugula nugula commented Mar 24, 2016

No description provided.

py8765 and others added 30 commits August 7, 2015 15:15
@py8765
update monitor component
0a3da39
@py8765
add command
5481f90
@py8765
update constants
a35d73d
@py8765
update node info prefix
08a72f3
@py8765
update monitor
338813f
@py8765
add component stop
a0a58be
@py8765
add zookeeper reconnect
a30d8a9
redis registry implemention
4e777fb
bug fix
c348a2c
@py8765
update command interface
c9e42a6
@hzxuzhonghu
add command support from redis_cli
2b6ff5f
@hzxuzhonghu
Merge branch '2.x' into redis-registry
6d03bfa
@hzxuzhonghu
update command execute sequence, first delete cmd
50b0737
@hzxuzhonghu
code format keep consistent with pomelo
8d2ae44
@hzxuzhonghu
update format
9bc3caa
@hzxuzhonghu
update format
45bb62b
@zhangmin510
fix CreateMode not defined
085d742
@py8765
remove unused code
5d574e6
@hzxuzhonghu
fix bug for redis registry, in case env not provided
46ad812
@hzxuzhonghu
redismonitor stop cmd
3c4b3e6
@py8765
remove add&remove event
6776dc4
unit test and jslint error fix
9c69634
fix unit test error
3a9e7cb
@hzxuzhonghu
use strict: update strict mode
b0c04f3
@py8765
add default serverType
ff26be7
@py8765
update zkmonitor closure
3c008bc
fix lint warn
0670f8e
fix application ut error
871db3c
ut update
a5ef36f
fix cmd.js ut and remove redis monitor component load
725c16a
py8765 and others added 30 commits November 4, 2015 17:50
@py8765
update sio connector parameter
3854216
@py8765
Merge branch '2.x' of github.com:NetEase/pomelo into 2.x
2f45ae3
@hzxuzhonghu
support 3 kind redis: single node & sentinel & cluster
0f696c6
@hzxuzhonghu
Merge branch '2.x' of github.com:NetEase/pomelo into 2.x
ead5022
@py8765
upgrade pomelo-rpc to 1.0.0
dac91d8
@py8765
update redis config parameters
c4bb09f
@hzxuzhonghu
modify default redis mode to single
8744135
@hzxuzhonghu
Merge branch '2.x' of github.com:NetEase/pomelo into 2.x
3755e12
@py8765
remove unused show commands
c1ec58d
@hzxuzhonghu
support pre_load serverInfo and other info
46ca2c8
@zhangmin510
fix zookeepermonitor show command
b36876a
@hzxuzhonghu
bug fix
5e02666
@hzxuzhonghu
Merge branch '2.x' of github.com:NetEase/pomelo into 2.x
17e29b9
@hzxuzhonghu
remove log info
a122152
@zhangmin510
fix get handler info
609588a
@py8765
upgrade pomelo-rpc to 1.0.1
0cef773
remove redisMonitor's cluster mode
4b0ffd2
@py8765
upgrade pomelo-rpc to 1.0.2
23481e6
@py8765
upgrade pomelo-loader to 0.0.7
737b4bc
@py8765
remove clear proxy
64686b7
@py8765
upgrade to 2.0.0-pre
52061fd
@zhangmin510
add redis ping to redesmonitor
993fd3f
@py8765 @zhangmin510
remove clear proxy
59488b5
@py8765 @zhangmin510
upgrade to 2.0.0-pre
b88f858
@zhangmin510
merge origin/2.x to avoid force push
03edb68
@zhangmin510
upgrade to 2.0.0, update pomelo-rpc to 1.0.3
0d5ad0f
Fixed a bug in redismonitor that crashed the app
dfd665d 
When the redis client disconnected and reconnected it tried to start
the app again and listen to the port already in use.

The fix ensures the connect callback is called just once to avoid
this bug.
@fantasyni
Merge pull request #854 from topfreegames/redismonitorfix
b79a693 
Fixed a bug in redismonitor that crashed the app
@mmacvicar
Adds an alternative lighter redis monitor
de16fe9
@fantasyni
Merge pull request #905 from topfreegames/redismonitorlight
99503ab 
Add a ligther redis monitor
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nugula @py8765 @hzxuzhonghu @zhangmin510 @fantasyni @mmacvicar