From: Michael Rasmussen <mir@datanom.net>
Date: Tue, 9 Sep 2014 21:14:26 +0000 (+0200)
Subject: Begin to apply correct NotifyListener
X-Git-Url: http://git.datanom.net/omvzfs.git/commitdiff_plain/cf4e471d86e8b05678e56f58a44212a43a6f9c82

Begin to apply correct NotifyListener
---

diff --git a/src/NotifyListener.php b/src/NotifyListener.php
new file mode 100644
index 0000000..5f55bd0
--- /dev/null
+++ b/src/NotifyListener.php
@@ -0,0 +1,118 @@
+<?php
+require_once('openmediavault/object.inc');
+require_once('openmediavault/module.inc');
+require_once("Exception.php");
+
+/**
+ * Class containing information about the pool
+ *
+ * @author    Michael Rasmussen
+ * @version   0.1
+ * @copyright Michael Rasmussen <mir@datanom.net>
+ */
+class OMVModuleZFS extends OMVModuleAbstract
+		implements OMVINotifyListener {
+
+	private $pools;
+
+	public function __construct() {
+		$this->pools = array();
+		$this->updatePools();
+	}
+
+	public function getName() {
+		return "zfs";
+	}
+
+    public function bindListeners(OMVNotifyDispatcher $dispatcher) {
+		// Update service if configuration has been modified
+		$dispatcher->addListener(
+		  OMV_NOTIFY_MODIFY,
+		  "org.openmediavault.services.nfs",
+		  array($this, "onUpdateNFSService"));
+		$dispatcher->addListener(
+		  OMV_NOTIFY_CREATE,
+		  "org.openmediavault.services.nfs.shares.share",
+		  array($this, "onCreateNFSShare"));
+		$dispatcher->addListener(
+		  OMV_NOTIFY_DELETE,
+		  "org.openmediavault.services.nfs.shares.share",
+		  array($this, "onDeleteNFSShare"));
+		$dispatcher->addListener(
+		  OMV_NOTIFY_MODIFY,
+		  "org.openmediavault.services.nfs.shares.share",
+		  array($this, "onUpdateNFSShare"));
+    }
+
+	/**
+	 * XXX
+	 * org.openmediavault.services.nfs
+	 *
+	 * @param string event
+	 * @access public
+	 */
+	public function onUpdateNFSService($args) {
+        $this->debug(sprintf("onUpdateNFSService args=%s", var_export($args, true)));
+	}
+
+	/**
+	 * XXX
+	 * org.openmediavault.services.nfs.shares.share
+	 *
+	 * @param string event
+	 * @access public
+	 */
+	public function onCreateNFSShare($args) {
+        $this->debug(sprintf("onCreateNFSShare args=%s", var_export($args, true)));
+	}
+
+	/**
+	 * XXX
+	 * org.openmediavault.services.nfs.shares.share
+	 *
+	 * @param string event
+	 * @access public
+	 */
+	public function onDeleteNFSShare($args) {
+        $this->debug(sprintf("onDeleteNFSShare args=%s", var_export($args, true)));
+	}
+
+	/**
+	 * XXX
+	 * org.openmediavault.services.nfs.shares.share
+	 *
+	 * @param string event
+	 * @access public
+	 */
+	public function onUpdateNFSShare($args) {
+        $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
+	}
+
+	/**
+	 * Helper function to execute a command and throw an exception on error
+	 * (requires stderr redirected to stdout for proper exception message).
+	 *
+	 * @param string $cmd Command to execute
+	 * @param array &$out If provided will contain output in an array
+	 * @param int &$res If provided will contain Exit status of the command
+	 * @return string Last line of output when executing the command
+	 * @throws OMVModuleZFSException
+	 * @access public
+	 */
+	private function exec($cmd, &$out = null, &$res = null) {
+		$tmp = OMVUtil::exec($cmd, $out, $res);
+		if ($res) {
+			throw new OMVModuleZFSException(implode("\n", $out));
+		}
+		return $tmp;
+	}
+
+	private function updatePools() {
+
+	}
+}
+
+	// Register module.
+	$moduleMgr = &OMVModuleMgr::getInstance();
+	$moduleMgr->registerModule(new OMVModuleZFS());
+?>
diff --git a/src/Zpool.php b/src/Zpool.php
index c8d4ae9..41fd052 100644
--- a/src/Zpool.php
+++ b/src/Zpool.php
@@ -16,8 +16,7 @@ require_once("Exception.php");
  * @version   0.1
  * @copyright Michael Rasmussen <mir@datanom.net>
  */
-class OMVModuleZFSZpool extends OMVModuleAbstract
-		implements OMVINotifyListener {
+class OMVModuleZFSZpool extends OMVModuleAbstract {
     // Attributes
     /**
      * Name of pool
@@ -525,70 +524,6 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 			throw new OMVModuleZFSException($output);
     }
 
-    public function bindListeners(OMVNotifyDispatcher $dispatcher) {
-		// Update service if configuration has been modified
-		$dispatcher->addListener(
-		  OMV_NOTIFY_MODIFY,
-		  "org.openmediavault.services.nfs",
-		  array($this, "onUpdateNFSService"));
-		$dispatcher->addListener(
-		  OMV_NOTIFY_CREATE,
-		  "org.openmediavault.services.nfs.shares.share",
-		  array($this, "onCreateNFSShare"));
-		$dispatcher->addListener(
-		  OMV_NOTIFY_DELETE,
-		  "org.openmediavault.services.nfs.shares.share",
-		  array($this, "onDeleteNFSShare"));
-		$dispatcher->addListener(
-		  OMV_NOTIFY_MODIFY,
-		  "org.openmediavault.services.nfs.shares.share",
-		  array($this, "onUpdateNFSShare"));
-    }
-
-	/**
-	 * XXX
-	 * org.openmediavault.services.nfs
-	 *
-	 * @param string event
-	 * @access public
-	 */
-	public function onUpdateNFSService($args) {
-        $this->debug(sprintf("onUpdateNFSService args=%s", var_export($args, true)));
-	}
-
-	/**
-	 * XXX
-	 * org.openmediavault.services.nfs.shares.share
-	 *
-	 * @param string event
-	 * @access public
-	 */
-	public function onCreateNFSShare($args) {
-        $this->debug(sprintf("onCreateNFSShare args=%s", var_export($args, true)));
-	}
-
-	/**
-	 * XXX
-	 * org.openmediavault.services.nfs.shares.share
-	 *
-	 * @param string event
-	 * @access public
-	 */
-	public function onDeleteNFSShare($args) {
-        $this->debug(sprintf("onDeleteNFSShare args=%s", var_export($args, true)));
-	}
-
-	/**
-	 * XXX
-	 * org.openmediavault.services.nfs.shares.share
-	 *
-	 * @param string event
-	 * @access public
-	 */
-	public function onUpdateNFSShare($args) {
-        $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
-	}
-
 	/**
 	 * Get a single property value associated with the Dataset
 	 *
@@ -911,5 +846,4 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
 	}
 
 }
-
 ?>