Merge lp:~alain-miltenburg/powernap/powernap into lp:powernap

[Alain Miltenburg]

Unmerged revisions

295. By Alain Miltenburg on 2013-10-10

DiskMonitor: added the ability to monitor disks by symlink (LP: #1222851)

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-19 16:11:05 +0000
+++ debian/changelog	2013-10-10 14:03:30 +0000
@@ -1,3 +1,9 @@
+powernap (2.19ubuntu1) UNRELEASED; urgency=low
+
+  * DiskMonitor: added the ability to monitor disks by symlink (LP: #1222851)
+
+ -- Alain Miltenburg <[e-mail]>  Thu, 10 Oct 2013 15:56:35 +0200
+
 powernap (2.19) unreleased; urgency=low
 
   * UNRELEASED

=== added directory 'debian/patches'
=== added file 'debian/patches/diskmonitor-by-symlink.patch'
--- debian/patches/diskmonitor-by-symlink.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/diskmonitor-by-symlink.patch	2013-10-10 14:03:30 +0000
@@ -0,0 +1,64 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: powernap.dev/config
+===================================================================
+--- powernap.dev.orig/config	2013-10-10 15:44:02.257419000 +0200
++++ powernap.dev/config	2013-10-10 15:52:05.276933941 +0200
+@@ -217,11 +217,11 @@
+ # 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.
++# The monitor accepts disk devices found under /dev/ as well as symbolic
++# links to them found under /dev/disk/.
+ # Examples:
+-#  sda = y
+-#  sdb = n
++#  sda = /dev/sda
++#  disk1 = /dev/disk/by-uuid/38fb40d0-195d-11e3-8ffd-0800200c9a66
+ [DiskMonitor]
+-#sda = y
++#sda = /dev/sda
+ 
+Index: powernap.dev/powernap/monitors/DiskMonitor.py
+===================================================================
+--- powernap.dev.orig/powernap/monitors/DiskMonitor.py	2013-10-10 15:44:02.257419000 +0200
++++ powernap.dev/powernap/monitors/DiskMonitor.py	2013-10-10 15:54:41.108932190 +0200
+@@ -28,6 +28,7 @@
+     def __init__(self, config):
+         self._type = config['monitor']
+         self._name = config['name']
++        self._device = config['device']
+         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
+@@ -44,7 +45,11 @@
+     # '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()
++        if self._device == 'y' or self._device == 'yes':
++            # Necessary for backward compatibility with older configuration files.
++            hdparm = commands.getoutput("hdparm -C /dev/%s" % self._name).splitlines()
++        else:
++            hdparm = commands.getoutput("hdparm -C %s" % self._device).splitlines()
+         is_active = True
+         for line in hdparm:
+             if self._regex_not_found.match(line):
+Index: powernap.dev/powernap/powernap.py
+===================================================================
+--- powernap.dev.orig/powernap/powernap.py	2013-10-10 15:44:02.257419000 +0200
++++ powernap.dev/powernap/powernap.py	2013-10-10 15:55:37.792931553 +0200
+@@ -163,8 +163,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})
++        if monitor == "DiskMonitor" and (items[1] != "n" and items[1] != "no"):
++            self.MONITORS.append({"monitor":monitor, "name":items[0], "device":items[1], "absent":self.ABSENT_SECONDS})
+ 
+     def get_monitors(self):
+         monitor = []

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-10-10 14:03:30 +0000
@@ -0,0 +1,1 @@
+diskmonitor-by-symlink.patch