diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 1bdb38990..5add060ae 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -904,7 +904,7 @@ $('.disabled-track-overlay', $track).show(); $('.track-connection', $track).removeClass('red yellow green').addClass('red'); } - var participant = (sessionModel.getParticipant(clientId) || {name:'unknown'}).name; + var participant = (sessionModel.getParticipant(clientId) || { user: {name: 'unknown'}}).user.name; logger.debug("still looking for mixer for participant=" + participant + ", clientId=" + clientId) } } diff --git a/websocket-gateway/script/package/post-install.sh b/websocket-gateway/script/package/post-install.sh index fb09f8d7f..2f794e45a 100755 --- a/websocket-gateway/script/package/post-install.sh +++ b/websocket-gateway/script/package/post-install.sh @@ -11,5 +11,7 @@ GROUP="$NAME" cp /var/lib/$NAME/script/package/$NAME.conf /etc/init/$NAME.conf mkdir -p /var/lib/$NAME/log +mkdir -p /var/log/$NAME chown -R $USER:$GROUP /var/lib/$NAME +chown -R $USER:$GROUP /var/log/$NAME diff --git a/websocket-gateway/script/package/upstart-run.sh b/websocket-gateway/script/package/upstart-run.sh index f72bdeaac..0df30a0e7 100755 --- a/websocket-gateway/script/package/upstart-run.sh +++ b/websocket-gateway/script/package/upstart-run.sh @@ -1,14 +1,15 @@ #!/bin/bash -l +JAM_INSTANCE="$1" + usage() { echo "pass one numerical argument representing the instance of this websocket-gateway" + exit 0 } -usage main() +main() { - JAM_INSTANCE=$1 - # default config values BUILD_NUMBER=`cat /var/lib/websocket-gateway/BUILD_NUMBER`