"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "devstack/plugin.sh" between
zaqar-5.0.0.tar.gz and zaqar-7.0.0.tar.gz

About: OpenStack Zaqar is a multi-tenant cloud messaging and notification service for web and mobile developers.
The "Rocky" series (latest release).

plugin.sh  (zaqar-5.0.0):plugin.sh  (zaqar-7.0.0)
skipping to change at line 77 skipping to change at line 77
setup_develop $ZAQARCLIENT_DIR setup_develop $ZAQARCLIENT_DIR
} }
# configure_zaqar() - Set config files, create data dirs, etc # configure_zaqar() - Set config files, create data dirs, etc
function configure_zaqar { function configure_zaqar {
setup_develop $ZAQAR_DIR setup_develop $ZAQAR_DIR
[ ! -d $ZAQAR_CONF_DIR ] && sudo mkdir -m 755 -p $ZAQAR_CONF_DIR [ ! -d $ZAQAR_CONF_DIR ] && sudo mkdir -m 755 -p $ZAQAR_CONF_DIR
sudo chown $USER $ZAQAR_CONF_DIR sudo chown $USER $ZAQAR_CONF_DIR
if [[ -f $ZAQAR_DIR/etc/policy.json.sample ]]; then
cp -p $ZAQAR_DIR/etc/policy.json.sample $ZAQAR_POLICY_CONF
fi
[ ! -d $ZAQAR_API_LOG_DIR ] && sudo mkdir -m 755 -p $ZAQAR_API_LOG_DIR [ ! -d $ZAQAR_API_LOG_DIR ] && sudo mkdir -m 755 -p $ZAQAR_API_LOG_DIR
sudo chown $USER $ZAQAR_API_LOG_DIR sudo chown $USER $ZAQAR_API_LOG_DIR
iniset $ZAQAR_CONF DEFAULT debug True iniset $ZAQAR_CONF DEFAULT debug True
iniset $ZAQAR_CONF DEFAULT unreliable True iniset $ZAQAR_CONF DEFAULT unreliable True
iniset $ZAQAR_CONF DEFAULT admin_mode True iniset $ZAQAR_CONF DEFAULT admin_mode True
iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1,1.1 iniset $ZAQAR_CONF DEFAULT enable_deprecated_api_versions 1,1.1
iniset $ZAQAR_CONF signed_url secret_key notreallysecret iniset $ZAQAR_CONF signed_url secret_key notreallysecret
if is_service_enabled key; then if is_service_enabled key; then
skipping to change at line 253 skipping to change at line 249
setup_install $ZAQARCLIENT_DIR setup_install $ZAQARCLIENT_DIR
} }
# start_zaqar() - Start running processes, including screen # start_zaqar() - Start running processes, including screen
function start_zaqar { function start_zaqar {
cat $ZAQAR_UWSGI_CONF cat $ZAQAR_UWSGI_CONF
run_process zaqar-wsgi "$ZAQAR_BIN_DIR/uwsgi --ini $ZAQAR_UWSGI_CONF --pidfi le2 $ZAQAR_UWSGI_MASTER_PIDFILE" run_process zaqar-wsgi "$ZAQAR_BIN_DIR/uwsgi --ini $ZAQAR_UWSGI_CONF --pidfi le2 $ZAQAR_UWSGI_MASTER_PIDFILE"
run_process zaqar-websocket "$ZAQAR_BIN_DIR/zaqar-server --config-file $ZAQA R_CONF" run_process zaqar-websocket "$ZAQAR_BIN_DIR/zaqar-server --config-file $ZAQA R_CONF"
echo "Waiting for Zaqar to start..." echo "Waiting for Zaqar to start..."
token=$(openstack token issue -c id -f value) local www_authenticate_uri=http://${ZAQAR_SERVICE_HOST}/identity
token=$(openstack token issue -c id -f value --os-auth-url ${www_authenticat
e_uri})
if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q --header=\"C lient-ID:$(uuidgen)\" --header=\"X-Auth-Token:$token\" -O- $ZAQAR_SERVICE_PROTOC OL://$ZAQAR_SERVICE_HOST:$ZAQAR_SERVICE_PORT/v2/ping; do sleep 1; done"; then if ! timeout $SERVICE_TIMEOUT sh -c "while ! wget --no-proxy -q --header=\"C lient-ID:$(uuidgen)\" --header=\"X-Auth-Token:$token\" -O- $ZAQAR_SERVICE_PROTOC OL://$ZAQAR_SERVICE_HOST:$ZAQAR_SERVICE_PORT/v2/ping; do sleep 1; done"; then
die $LINENO "Zaqar did not start" die $LINENO "Zaqar did not start"
fi fi
} }
# stop_zaqar() - Stop running processes # stop_zaqar() - Stop running processes
function stop_zaqar { function stop_zaqar {
local serv local serv
# Kill the zaqar screen windows # Kill the zaqar screen windows
for serv in zaqar-wsgi zaqar-websocket; do for serv in zaqar-wsgi zaqar-websocket; do
 End of changes. 2 change blocks. 
5 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)