Merge pull request #27 from nalbam/main

v0.5.2 pm2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepracer-timer",
-  "version": "v0.5.1",
+  "version": "v0.5.2",
   "description": "Node.js deepracer-timer",
   "main": "server.js",
   "dependencies": {

run.sh

@@ -66,46 +66,28 @@ _usage() {
 }
 
 _stop() {
-  _pid
-
-  if [ "${PID}" != "" ]; then
-    _command "kill -9 ${PID}"
-    kill -9 ${PID}
-
-    _result "deepracer-timer is killed: ${PID}"
-  fi
-}
+  pushd ${SHELL_DIR}
 
-_status() {
-  _pid
+  sudo pm2 stop server.js
 
-  if [ "${PID}" != "" ]; then
-    _result "deepracer-timer was started: ${PID}"
-  else
-    _result "deepracer-timer is stopped"
-  fi
+  popd
 }
 
 _start() {
-  _pid
-
-  if [ "${PID}" != "" ]; then
-    _error "deepracer-timer has already started: ${PID}"
-  fi
-
   pushd ${SHELL_DIR}
 
-  echo "# _start" >nohup.out
-  _command "nohup node server.js &"
-  nohup node server.js &
+  sudo pm2 start server.js
+  sudo pm2 save
 
   popd
+}
 
-  _pid
+_status() {
+  sudo pm2 list
+}
 
-  if [ "${PID}" != "" ]; then
-    _result "deepracer-timer was started: ${PID}"
-  fi
+_log() {
+  sudo pm2 logs
 }
 
 _init() {
@@ -115,6 +97,13 @@ _init() {
     sudo apt install -y nodejs
   fi
 
+  command -v pm2 >/dev/null || PM2="false"
+  if [ "${PM2}" == "false" ]; then
+    sudo npm install pm2 -g
+  fi
+
+  sudo pm2 startup
+
   pushd ${SHELL_DIR}
   git pull
   npm run build
@@ -125,19 +114,12 @@ _hangul() {
   sudo apt install -y ibus ibus-hangul fonts-unfonts-core
 }
 
-_log() {
-  tail -n 500 -f ${SHELL_DIR}/nohup.out
-}
-
 case ${CMD} in
 init)
   _stop
   _init
   _start
   ;;
-status)
-  _status
-  ;;
 start)
   _start
   ;;
@@ -148,6 +130,9 @@ restart)
 stop)
   _stop
   ;;
+status)
+  _status
+  ;;
 log)
   _log
   ;;

views/index.ejs

@@ -23,6 +23,7 @@
   </div>
   <div class="lb-title">
     <a href="/timer" class="btn-link">Timer</a>
+    <a href="https://dracer.io" class="btn-link">Board</a>
   </div>
 </body>