浏览代码

Remove logging settings which cause crashes

Bob Mottram 8 年前
父节点
当前提交
941c13267e
共有 2 个文件被更改,包括 16 次插入22 次删除
  1. 1
    21
      src/freedombone-app-etherpad
  2. 15
    1
      src/freedombone-utils-nodejs

+ 1
- 21
src/freedombone-app-etherpad 查看文件

181
     echo '      ["timeslider_export", "timeslider_returnToPad"]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
181
     echo '      ["timeslider_export", "timeslider_returnToPad"]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
182
     echo '    ]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
182
     echo '    ]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
183
     echo '  },' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
183
     echo '  },' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
184
-    echo '  "loglevel": "INFO",' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
185
-    echo '  "logconfig" :' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
186
-    echo '    { "appenders": [' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
187
-    echo '        { "type": "console"' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
188
-    echo '        //, "category": "access"// only logs pad access' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
189
-    echo '        },' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
190
-    echo '        { "type": "logLevelFilter"' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
191
-    echo '        , "level": "error" // filters out all log messages that have a lower level than "error"' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
192
-    echo '        , "appender":' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
193
-    echo '          { "type": "smtp"' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
194
-    echo '          , "subject": "[Admin] An error occured in your Etherpad instance!"' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
195
-    echo "          , \"recipients\": \"admin@${DEFAULT_DOMAIN_NAME}\"" >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
196
-    echo '          , "sendInterval": 300 // 60 * 5 = 5 minutes -- will buffer log messages; set to 0 to send a mail for every message' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
197
-    echo '          , "transport": "SMTP", "SMTP": { // see https://github.com/andris9/Nodemailer#possible-transport-methods' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
198
-    echo '              "host": "localhost", "port": 25,' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
199
-    echo '              "secureConnection": false,' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
200
-    echo '            }' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
201
-    echo '          }' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
202
-    echo '      }' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
203
-    echo '      ]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
204
-    echo '    }' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
184
+    echo '  "loglevel": "INFO"' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
205
     echo '}' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
185
     echo '}' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
206
 }
186
 }
207
 
187
 

+ 15
- 1
src/freedombone-utils-nodejs 查看文件

33
 
33
 
34
 VARIANTS='mesh'
34
 VARIANTS='mesh'
35
 
35
 
36
-NODEJS_VERSION='6.2.2'
36
+# change these versions at your peril. Things will often crash if you don't
37
+# have specifically the correct versions
38
+NODEJS_VERSION='6.9.0'
37
 NODEJS_N_VERSION='2.1.4'
39
 NODEJS_N_VERSION='2.1.4'
40
+NPM_VERSION='4.0.2'
38
 
41
 
39
 # This file keeps track of the apps needing nodejs
42
 # This file keeps track of the apps needing nodejs
40
 # so that it can be removed if tere are no apps which need it
43
 # so that it can be removed if tere are no apps which need it
79
     fi
82
     fi
80
     sed -i "/install_${1}/d" $NODEJS_INSTALLED_APPS_FILE
83
     sed -i "/install_${1}/d" $NODEJS_INSTALLED_APPS_FILE
81
     if ! grep "install_" $NODEJS_INSTALLED_APPS_FILE; then
84
     if ! grep "install_" $NODEJS_INSTALLED_APPS_FILE; then
85
+        cat <<EOF > /root/remove-nodejs.sh
86
+#!/bin/bash
87
+PATH="/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/bin"
88
+NODE_PATH="/usr/lib/node_modules"
89
+npm uninstall -g --save
90
+exit 0
91
+EOF
92
+        chmod +x /root/remove-nodejs.sh
93
+        /root/remove-nodejs.sh
94
+
82
         apt-get -yq remove --purge nodejs
95
         apt-get -yq remove --purge nodejs
83
 
96
 
84
         if [ -f /usr/bin/nodejs ]; then
97
         if [ -f /usr/bin/nodejs ]; then
125
 /usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
138
 /usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
126
 npm install -g n@${NODEJS_N_VERSION} --save
139
 npm install -g n@${NODEJS_N_VERSION} --save
127
 n ${NODEJS_VERSION}
140
 n ${NODEJS_VERSION}
141
+npm update -g npm@{NPM_VERSION}
128
 exit 0
142
 exit 0
129
 EOF
143
 EOF
130
     chmod +x /root/install-nodejs.sh
144
     chmod +x /root/install-nodejs.sh