浏览代码

Allow some uptime before reporting gnusocial/postactiv daemon restart

Bob Mottram 7 年前
父节点
当前提交
1b349bbd53
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6
    3
      src/freedombone-utils-gnusocialtools

+ 6
- 3
src/freedombone-utils-gnusocialtools 查看文件

464
       echo '/htdocs/scripts/queuedaemon.php" | grep "/var/www")';
464
       echo '/htdocs/scripts/queuedaemon.php" | grep "/var/www")';
465
       echo "cd /var/www/${domain_name}/htdocs";
465
       echo "cd /var/www/${domain_name}/htdocs";
466
       echo "if [[ \$daemon_lines != *\"/var/www/\"* ]]; then";
466
       echo "if [[ \$daemon_lines != *\"/var/www/\"* ]]; then";
467
-      echo "    ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')";
468
-      echo "    MY_EMAIL_ADDRESS=\$ADMIN_USER@$HOSTNAME";
469
-      echo -n "    echo \"Restarting ${gnusocial_type} daemons\" | mail -s \"${gnusocial_type} ";
467
+      echo "    UPTIME=\$(awk -F '.' '{print \$1}' < \"/proc/uptime\")";
468
+      echo "    if [ \"\$UPTIME\" -gt 500 ]; then";
469
+      echo "        ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')";
470
+      echo "        MY_EMAIL_ADDRESS=\$ADMIN_USER@$HOSTNAME";
471
+      echo -n "        echo \"Restarting ${gnusocial_type} daemons\" | mail -s \"${gnusocial_type} ";
470
       echo "daemons not found\" \$MY_EMAIL_ADDRESS";
472
       echo "daemons not found\" \$MY_EMAIL_ADDRESS";
473
+      echo '    fi';
471
       echo '    su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data';
474
       echo '    su -c "sh scripts/startdaemons.sh" -s /bin/sh www-data';
472
       echo 'fi';
475
       echo 'fi';
473
       echo 'php scripts/delete_orphan_files.php > /dev/null';
476
       echo 'php scripts/delete_orphan_files.php > /dev/null';