Merge lp:~jinfo/powernap/trunk into lp:powernap

[Andres Rodriguez]

=== modified file 'config'
--- config	2011-01-31 23:24:48 +0000
+++ config	2011-04-19 18:22:24 +0000
@@ -165,3 +165,20 @@
 [InputMonitor]
 keyboard = y
 mouse = y
+
+# The [DiskMonitor] section lists the disk devices for which to track
+# standby/sleep status.  If any of the devices are active/idle the
+# system will be deemed 'active' and will not powernap. Generally useful
+# for monitoring data drives (e.g. NAS), but will not typically work to
+# monitor the root drive. Note also that this plugin only reacts to the
+# state of the drive and does not modify the behavior of the drive
+# directly. Therefore it only makes sense to monitor a drive that has
+# already been configured to standby or sleep.  
+# To disable checking specific drives, set them to "n" or "no",
+# or simply comment them.
+# Examples:
+#  sda = y
+#  sdb = n
+[DiskMonitor]
+#sda = y
+

=== added file 'powernap/monitors/DiskMonitor.py'
--- powernap/monitors/DiskMonitor.py	1970-01-01 00:00:00 +0000
+++ powernap/monitors/DiskMonitor.py	2011-04-19 18:22:24 +0000
@@ -0,0 +1,67 @@
+#    powernapd plugin - Monitors disk power state
+#
+#    Copyright (C) 2010, 2011 Canonical Ltd.
+#
+#    Authors: Jim Heck <[e-mail]>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 3 of the License.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+import re, commands
+from logging import error, debug, info, warn
+
+# Monitor plugin
+#   looks for disks that are active/idle.  Useful for sleeping only when
+#   specified disks are in standby
+
+class DiskMonitor ():
+
+    # Initialise
+    def __init__(self, config):
+        self._type = config['monitor']
+        self._name = config['name']
+        self._regex_state = re.compile(r"^\s+drive\s+state\s+is:\s+(\S+)")
+        self._regex_not_found = re.compile(r"^.*No\s+such\s+file")
+        self._absent_seconds = 0
+
+    def start(self):
+        pass
+
+    def active(self):
+        if self.is_disk_active():
+            return True
+        return False
+
+    # Check for inactive drive by looking explicitly for drive state of
+    # 'standby' or 'sleeping'.  Assume 'active/idle', except in case
+    # where fuction returns 'No such file' error (e.g. unknown drive)
+    def is_disk_active(self):
+        hdparm = commands.getoutput("hdparm -C /dev/%s" % self._name).splitlines()
+        is_active = True
+        for line in hdparm:
+            if self._regex_not_found.match(line):
+                #warn("    Disk monitor: disk %s not found, ignoring" % self._name)
+                return False
+            if self._regex_state.match(line):
+                state = self._regex_state.search(line).group(1)
+                #debug("    Disk monitor: disk %s in state %s" % (self._name, state))
+                if state == 'standby' or state == 'sleeping':
+                    is_active = False
+        if is_active:
+            return True
+        return False
+
+
+# ###########################################################################
+# Editor directives
+# ###########################################################################
+
+# vim:sts=4:ts=4:sw=4:et

=== modified file 'powernap/powernap.py'
--- powernap/powernap.py	2011-03-14 21:24:39 +0000
+++ powernap/powernap.py	2011-04-19 18:22:24 +0000
@@ -19,7 +19,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import ConfigParser, sys, re, os
-from monitors import ProcessMonitor, LoadMonitor, InputMonitor, TCPMonitor, UDPMonitor, IOMonitor, WoLMonitor, ConsoleMonitor
+from monitors import ProcessMonitor, LoadMonitor, InputMonitor, TCPMonitor, UDPMonitor, IOMonitor, WoLMonitor, ConsoleMonitor, DiskMonitor
 
 
 class PowerNap:
@@ -133,6 +133,8 @@
                 self.MONITORS.append({"monitor":monitor, "name":items[0], "port":eval(items[1]), "absent":self.ABSENT_SECONDS})
         if monitor == "WoLMonitor":
             self.MONITORS.append({"monitor":monitor, "name":items[0], "port":eval(items[1]), "absent":self.ABSENT_SECONDS})
+        if monitor == "DiskMonitor" and (items[1] == "y" or items[1] == "yes"):
+            self.MONITORS.append({"monitor":monitor, "name":items[0], "absent":self.ABSENT_SECONDS})
 
     def get_monitors(self):
         monitor = []
@@ -153,6 +155,8 @@
                 p = IOMonitor.IOMonitor(config)
             if config["monitor"] == "TCPMonitor":
                 p = TCPMonitor.TCPMonitor(config)
+            if config["monitor"] == "DiskMonitor":
+                p = DiskMonitor.DiskMonitor(config)
             monitor.append(p)
 
         return monitor