Merge pull request #80 from naparuba/master

Résolution du soucis de mesure de la mémoire disponible

src/lib/osutils.js

@@ -18,11 +18,29 @@ exports.processUptime = function(){
   return process.uptime();
 };
 
-// Memory
-exports.freemem = function(){
-  return _os.freemem() / ( 1024 * 1024 );
+// Memory: read directly into /proc/meminfo because _os.freemem() do not count cached as available
+exports.freemem = function() {
+    var fs          = require( 'fs' );
+    var array       = fs.readFileSync( '/proc/meminfo' ).toString().split( "\n" );
+    var free_memory = 0;
+    for ( var idx in array ) {
+        var line = array[ idx ];
+        var elts = line.split( /\s+/ ); // looks like key   value  KB <= some value are without KB but we do not look at them
+        var key  = elts[ 0 ];
+        // Total memory of the system (physical): MemTotal
+        // Free memory =
+        //  * MemFree:
+        //  * Buffers: (into files)
+        //  * Cached: (file flushed but before the disks)
+        //  * SReclaimable: (kernel slabs that can be release)
+        if ( key === 'MemFree:' || key === 'Buffers:' || key === 'Cached:' || key === 'SReclaimable:' ) {
+            free_memory += parseInt( elts[ 1 ] );  // Note: values are in KB
+        }
+    }
+    return free_memory / 1024;  // into MB, to match totalmem
 };
 
+
 exports.totalmem = function(){
   return _os.totalmem() / ( 1024 * 1024 );
 };

src/routes/get.js

@@ -127,7 +127,7 @@ router.get('/', async (req, res, next) => {
         data = await getEsSystems();
         break;
       case 'temperature':
-        const currentTemp = execSync('cat /sys/class/thermal/thermal_zone0/temp').toString() / 1000;
+        const currentTemp = execSync('cat /sys/class/thermal/thermal_zone0/temp 2> /dev/null || echo 0').toString() / 1000;
         const maxTemp = 100;
         const currentPercent = Math.floor(currentTemp * 100 / maxTemp);