Skip to content

Commit

Permalink
add show_twem_stats tool
Browse files Browse the repository at this point in the history
  • Loading branch information
deep011 committed Apr 20, 2016
1 parent 0d35acb commit c0e7396
Show file tree
Hide file tree
Showing 9 changed files with 1,604 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
# Core and executable
core*
nutcracker
show_twem_stats

# extracted yaml
!/contrib/yaml-0.1.4.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions src/nc_manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,8 @@ manage_listen(struct context *ctx, struct conn *p)

status = bind(p->sd, p->addr, p->addrlen);
if (status < 0) {
log_error("bind on p %d to addr '%.*s' failed for management: %s", p->sd,
manager->addrstr.len, manager->addrstr.data, strerror(errno));
log_error("bind on p %d to addr '%.*s:%d' failed for management: %s", p->sd,
manager->addrstr.len, manager->addrstr.data, manager->port, strerror(errno));
return NC_ERROR;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/conf/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
'REDIS_SERVER_BINS' : os.path.join(WORKDIR, '_binaries/redis-*'),
'REDIS_CLI' : os.path.join(WORKDIR, '_binaries/redis-cli'),
'MEMCACHED_BINS' : os.path.join(WORKDIR, '_binaries/memcached'),
'NUTCRACKER_BINS' : os.path.join(WORKDIR, '_binaries/nutcracker'),
'NUTCRACKER_BINS' : os.path.join(WORKDIR, '_binaries/nutcrackers'),
}

6 changes: 3 additions & 3 deletions tests/lib/server_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class Memcached(Base):
def __init__(self, host, port, path, cluster_name, server_name):
Base.__init__(self, 'memcached', host, port, path)

self.args['startcmd'] = TT('bin/memcached -d -p $port', self.args)
self.args['startcmd'] = TT('bin/memcached -u root -d -p $port', self.args)
self.args['runcmd'] = self.args['startcmd']

self.args['cluster_name'] = cluster_name
Expand Down Expand Up @@ -228,10 +228,10 @@ def __init__(self, host, port, path, cluster_name, masters, mbuf=512,
self.args['logfile'] = TT('$path/log/nutcracker.log', self.args)
self.args['status_port'] = self.args['port'] + 1000

self.args['startcmd'] = TTCMD('bin/nutcracker -d -c $conf -o $logfile \
self.args['startcmd'] = TTCMD('bin/nutcrackers -d -c $conf -o $logfile \
-p $pidfile -s $status_port \
-v $verbose -m $mbuf -i 1', self.args)
self.args['runcmd'] = TTCMD('bin/nutcracker -d -c $conf -o $logfile \
self.args['runcmd'] = TTCMD('bin/nutcrackers -d -c $conf -o $logfile \
-p $pidfile -s $status_port', self.args)

self.args['cluster_name']= cluster_name
Expand Down
3 changes: 3 additions & 0 deletions tools/show_twemproxies_stats/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

gcc -o show_twem_stats show_twem_stats.c cJSON.c -lm
Loading

0 comments on commit c0e7396

Please sign in to comment.