Quellcode durchsuchen

Remove logging settings which cause crashes

Bob Mottram vor 8 Jahren
Ursprung
Commit
941c13267e
2 geänderte Dateien mit 16 neuen und 22 gelöschten Zeilen
  1. 1
    21
      src/freedombone-app-etherpad
  2. 15
    1
      src/freedombone-utils-nodejs

+ 1
- 21
src/freedombone-app-etherpad Datei anzeigen

@@ -181,27 +181,7 @@ function create_etherpad_settings {
181 181
     echo '      ["timeslider_export", "timeslider_returnToPad"]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
182 182
     echo '    ]' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
183 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 185
     echo '}' >> /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
206 186
 }
207 187
 

+ 15
- 1
src/freedombone-utils-nodejs Datei anzeigen

@@ -33,8 +33,11 @@
33 33
 
34 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 39
 NODEJS_N_VERSION='2.1.4'
40
+NPM_VERSION='4.0.2'
38 41
 
39 42
 # This file keeps track of the apps needing nodejs
40 43
 # so that it can be removed if tere are no apps which need it
@@ -79,6 +82,16 @@ function remove_nodejs {
79 82
     fi
80 83
     sed -i "/install_${1}/d" $NODEJS_INSTALLED_APPS_FILE
81 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 95
         apt-get -yq remove --purge nodejs
83 96
 
84 97
         if [ -f /usr/bin/nodejs ]; then
@@ -125,6 +138,7 @@ cp /usr/bin/nodejs /usr/bin/node
125 138
 /usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
126 139
 npm install -g n@${NODEJS_N_VERSION} --save
127 140
 n ${NODEJS_VERSION}
141
+npm update -g npm@{NPM_VERSION}
128 142
 exit 0
129 143
 EOF
130 144
     chmod +x /root/install-nodejs.sh