mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
merge
This commit is contained in:
unknown
commit
4f07f59e14
3 changed files with 29 additions and 31 deletions
|
|
@ -32,10 +32,9 @@
|
|||
#include "common.hpp"
|
||||
|
||||
static const char *work_dir = CPCD_DEFAULT_WORK_DIR;
|
||||
static short unsigned int port;
|
||||
static int unsigned port;
|
||||
static int use_syslog;
|
||||
static const char *logfile = NULL;
|
||||
static const char *config_file = CPCD_DEFAULT_CONFIG_FILE;
|
||||
static const char *user = 0;
|
||||
|
||||
static struct my_option my_long_options[] =
|
||||
|
|
@ -55,9 +54,6 @@ static struct my_option my_long_options[] =
|
|||
{ "debug", 'D', "Enable debug mode",
|
||||
(gptr*) &debug, (gptr*) &debug, 0,
|
||||
GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
||||
{ "config", 'c', "Config file",
|
||||
(gptr*) &config_file, (gptr*) &config_file, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
||||
{ "user", 'u', "Run as user",
|
||||
(gptr*) &user, (gptr*) &user, 0,
|
||||
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
||||
|
|
@ -142,7 +138,8 @@ int main(int argc, char** argv){
|
|||
|
||||
SocketServer * ss = new SocketServer();
|
||||
CPCDAPIService * serv = new CPCDAPIService(cpcd);
|
||||
if(!ss->setup(serv, &port)){
|
||||
unsigned short real_port= port; // correct type
|
||||
if(!ss->setup(serv, &real_port)){
|
||||
logger.critical("Cannot setup server: %s", strerror(errno));
|
||||
sleep(1);
|
||||
delete ss;
|
||||
|
|
|
|||
|
|
@ -20,40 +20,40 @@ add_procs(){
|
|||
}
|
||||
|
||||
add_proc (){
|
||||
dir=""
|
||||
conf=""
|
||||
case $type in
|
||||
mgm)
|
||||
dir="ndb_mgmd"
|
||||
conf="[ndb_mgmd]\nId: $node_id\nHostName: $2\n"
|
||||
echo "$proc_no.ndb_mgmd" >> $dir_file
|
||||
echo "[ndb_mgmd]" >> $config_file
|
||||
echo "Id: $node_id" >> $config_file
|
||||
echo "HostName: $2" >> $config_file
|
||||
node_id=`expr $node_id + 1`
|
||||
;;
|
||||
api)
|
||||
dir="ndb_api"
|
||||
conf="[api]\nId: $node_id\nHostName: $2\n"
|
||||
echo "$proc_no.ndb_api" >> $dir_file
|
||||
echo "[api]" >> $config_file
|
||||
echo "Id: $node_id" >> $config_file
|
||||
echo "HostName: $2" >> $config_file
|
||||
node_id=`expr $node_id + 1`
|
||||
;;
|
||||
ndb)
|
||||
dir="ndbd"
|
||||
conf="[ndbd]\nId: $node_id\nHostName: $2\n"
|
||||
echo "$proc_no.ndbd" >> $dir_file
|
||||
echo "[ndbd]" >> $config_file
|
||||
echo "Id: $node_id" >> $config_file
|
||||
echo "HostName: $2" >> $config_file
|
||||
node_id=`expr $node_id + 1`
|
||||
;;
|
||||
mysqld)
|
||||
dir="mysqld"
|
||||
conf="[mysqld]\nId: $node_id\nHostName: $2\n"
|
||||
echo "$proc_no.mysqld" >> $dir_file
|
||||
echo "[ndb_mgmd]" >> $config_file
|
||||
echo "Id: $node_id" >> $config_file
|
||||
echo "HostName: $2" >> $config_file
|
||||
node_id=`expr $node_id + 1`
|
||||
;;
|
||||
mysql)
|
||||
dir="mysql"
|
||||
echo "$proc_no.mysql" >> $dir_file
|
||||
;;
|
||||
esac
|
||||
dir="$proc_no.$dir"
|
||||
proc_no=`expr $proc_no + 1`
|
||||
echo -e $dir >> $dir_file
|
||||
if [ "$conf" ]
|
||||
then
|
||||
echo -e $conf >> $config_file
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ done
|
|||
|
||||
if [ -f $conf ]
|
||||
then
|
||||
. $conf
|
||||
. ./$conf
|
||||
else
|
||||
echo "Can't find config file: $conf"
|
||||
exit
|
||||
|
|
@ -131,8 +131,10 @@ echo "$DATE $RUN" > $LOCK
|
|||
# trap them, and remove the #
|
||||
# Lock file before exit #
|
||||
#############################
|
||||
|
||||
trap "rm -f $LOCK" ERR
|
||||
if [ `uname -s` != "SunOS" ]
|
||||
then
|
||||
trap "rm -f $LOCK" ERR
|
||||
fi
|
||||
|
||||
# You can add more to this path#
|
||||
################################
|
||||
|
|
@ -191,7 +193,7 @@ then
|
|||
else
|
||||
echo $VERSION > /tmp/version.$$
|
||||
fi
|
||||
match=`grep -c "$VERSION" /tmp/version.$$`
|
||||
match=`grep -c "$VERSION" /tmp/version.$$ | xargs echo`
|
||||
rm -f /tmp/version.$$
|
||||
if [ $match -eq 0 ]
|
||||
then
|
||||
|
|
@ -229,7 +231,7 @@ filter(){
|
|||
shift
|
||||
while [ $# -gt 0 ]
|
||||
do
|
||||
if [ `grep -c $1 $neg` -eq 0 ] ; then echo $1; fi
|
||||
if [ `grep -c $1 $neg | xargs echo` -eq 0 ] ; then echo $1; fi
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
|
@ -294,13 +296,12 @@ choose_conf(){
|
|||
if [ -f $test_dir/conf-$1-$HOST.txt ]
|
||||
then
|
||||
echo "$test_dir/conf-$1-$HOST.txt"
|
||||
echo "$test_dir/conf-$1-$host.txt"
|
||||
elif [ -f $test_dir/conf-$1.txt ]
|
||||
then
|
||||
echo "$test_dir/conf-$1.txt"
|
||||
else
|
||||
echo "Unable to find conf file looked for" 1>&2
|
||||
echo "$testdir/conf-$1-host.txt and" 1>&2
|
||||
echo "$testdir/conf-$1-$HOST.txt and" 1>&2
|
||||
echo "$testdir/conf-$1.txt" 1>&2
|
||||
exit
|
||||
fi
|
||||
|
|
@ -343,7 +344,7 @@ start(){
|
|||
|
||||
count_hosts(){
|
||||
cnt=`grep "CHOOSE_host" $1 | awk '{for(i=1; i<=NF;i++) \
|
||||
if(match($i, "CHOOSE_host") > 0) print $i;}' | sort | uniq | wc -l`
|
||||
if(index($i, "CHOOSE_host") > 0) print $i;}' | sort | uniq | wc -l`
|
||||
echo $cnt
|
||||
}
|
||||
#######################################################
|
||||
|
|
|
|||
Loading…
Reference in a new issue