summaryrefslogtreecommitdiffstats
path: root/gearman
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-16 17:48:32 +0200
committerBjörn Geiger2011-08-16 17:48:32 +0200
commit3111786072c3d90715744844327add4dec3ffa10 (patch)
tree59f82a65f492cb0fa07a5f77f7e1ba69130332fc /gearman
parentkleine änderung (diff)
downloadpoolctrl-3111786072c3d90715744844327add4dec3ffa10.tar.gz
poolctrl-3111786072c3d90715744844327add4dec3ffa10.tar.xz
poolctrl-3111786072c3d90715744844327add4dec3ffa10.zip
worker korrigiert
Diffstat (limited to 'gearman')
-rwxr-xr-xgearman/osWorker.py4
-rwxr-xr-xgearman/pingWorker.py2
-rwxr-xr-xgearman/psWorker.py2
-rwxr-xr-xgearman/restartWorker.py4
-rwxr-xr-xgearman/shutdownWorker.py2
-rwxr-xr-xgearman/whoWorker.py4
-rwxr-xr-xgearman/wolWorker.py.html51
7 files changed, 9 insertions, 60 deletions
diff --git a/gearman/osWorker.py b/gearman/osWorker.py
index 94077d9..2387f06 100755
--- a/gearman/osWorker.py
+++ b/gearman/osWorker.py
@@ -14,7 +14,7 @@ def osWorker(worker, job):
validHostnameRegex = "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
if not (re.match(validIpAddressRegex, target) or re.match(validHostnameRegex, target)):
print 'malformed request'
- return json.dumps({"error":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
+ return json.dumps({"err":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
host = target
@@ -71,4 +71,4 @@ def osWorker(worker, job):
worker = GearmanWorker(["127.0.0.1"])
worker.register_task('os', osWorker)
-worker.work() \ No newline at end of file
+worker.work()
diff --git a/gearman/pingWorker.py b/gearman/pingWorker.py
index f7537e5..6bb7fe9 100755
--- a/gearman/pingWorker.py
+++ b/gearman/pingWorker.py
@@ -15,7 +15,7 @@ def pingTask(worker, job):
validHostnameRegex = "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
if not (re.match(validIpAddressRegex, target) or re.match(validHostnameRegex, target)):
print 'malformed request'
- return json.dumps({"error":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
+ return json.dumps({"err":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
pingcmd = subprocess.Popen(["ping", "-W", "%s" % timeout, "-c", "%s" % total, "%s" % target],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
diff --git a/gearman/psWorker.py b/gearman/psWorker.py
index cc7cdc0..967d819 100755
--- a/gearman/psWorker.py
+++ b/gearman/psWorker.py
@@ -14,7 +14,7 @@ def psWorker(worker, job):
validHostnameRegex = "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
if not (re.match(validIpAddressRegex, target) or re.match(validHostnameRegex, target)):
print 'malformed request'
- return json.dumps({"error":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
+ return json.dumps({"err":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
host = target
diff --git a/gearman/restartWorker.py b/gearman/restartWorker.py
index f449c19..9790323 100755
--- a/gearman/restartWorker.py
+++ b/gearman/restartWorker.py
@@ -14,7 +14,7 @@ def restartWorker(worker, job):
validHostnameRegex = "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
if not (re.match(validIpAddressRegex, target) or re.match(validHostnameRegex, target)):
print 'malformed request'
- return json.dumps({"error":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
+ return json.dumps({"err":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
host = target
@@ -66,4 +66,4 @@ def restartWorker(worker, job):
worker = GearmanWorker(["127.0.0.1"])
worker.register_task('restart', restartWorker)
-worker.work() \ No newline at end of file
+worker.work()
diff --git a/gearman/shutdownWorker.py b/gearman/shutdownWorker.py
index d0a7e44..57bc5d2 100755
--- a/gearman/shutdownWorker.py
+++ b/gearman/shutdownWorker.py
@@ -14,7 +14,7 @@ def shutdownWorker(worker, job):
validHostnameRegex = "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
if not (re.match(validIpAddressRegex, target) or re.match(validHostnameRegex, target)):
print 'malformed request'
- return json.dumps({"error":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
+ return json.dumps({"err":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
host = target
diff --git a/gearman/whoWorker.py b/gearman/whoWorker.py
index 85f800b..0897364 100755
--- a/gearman/whoWorker.py
+++ b/gearman/whoWorker.py
@@ -14,7 +14,7 @@ def whoWorker(worker, job):
validHostnameRegex = "^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$"
if not (re.match(validIpAddressRegex, target) or re.match(validHostnameRegex, target)):
print 'malformed request'
- return json.dumps({"error":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
+ return json.dumps({"err":"invalid parameter - must be ip or host address", "alive":False}) + "\n"
host = target
@@ -77,4 +77,4 @@ def whoWorker(worker, job):
worker = GearmanWorker(["127.0.0.1"])
worker.register_task('who', whoWorker)
-worker.work() \ No newline at end of file
+worker.work()
diff --git a/gearman/wolWorker.py.html b/gearman/wolWorker.py.html
deleted file mode 100755
index 0c5de3f..0000000
--- a/gearman/wolWorker.py.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<html><head>
-<title>wolWorker.py</title>
-<meta name="Generator" content="htmlizer/[twisted, version 10.2.0]" />
-<link rel="alternate" href="wolWorker.py" type="text/x-python" />
-
-</head>
-<body>
-<pre><span class="py-src-comment">#!/usr/bin/python</span>
-
-<span class="py-src-keyword">from</span> <span class="py-src-variable">gearman</span> <span class="py-src-keyword">import</span> <span class="py-src-variable">GearmanWorker</span>
-<span class="py-src-keyword">import</span> <span class="py-src-variable">socket</span>
-<span class="py-src-keyword">import</span> <span class="py-src-variable">struct</span>
-
-<span class="py-src-comment"># http://code.activestate.com/recipes/358449-wake-on-lan/</span>
-<span class="py-src-keyword">def</span> <span class="py-src-identifier">wake_on_lan</span>(<span class="py-src-parameter">macaddress</span>):
- <span class="py-src-string">""" Switches on remote computers using WOL. """</span>
-
- <span class="py-src-comment"># Check macaddress format and try to compensate.</span>
- <span class="py-src-keyword">if</span> <span class="py-src-variable">len</span>(<span class="py-src-variable">macaddress</span>) == <span class="py-src-number">12</span>:
- <span class="py-src-keyword">pass</span>
- <span class="py-src-keyword">elif</span> <span class="py-src-variable">len</span>(<span class="py-src-variable">macaddress</span>) == <span class="py-src-number">12</span> + <span class="py-src-number">5</span>:
- <span class="py-src-variable">sep</span> = <span class="py-src-variable">macaddress</span>[<span class="py-src-number">2</span>]
- <span class="py-src-variable">macaddress</span> = <span class="py-src-variable">macaddress</span>.<span class="py-src-variable">replace</span>(<span class="py-src-variable">sep</span>, <span class="py-src-string">''</span>)
- <span class="py-src-keyword">else</span>:
- <span class="py-src-keyword">raise</span> <span class="py-src-variable">ValueError</span>(<span class="py-src-string">'Incorrect MAC address format'</span>)
-
- <span class="py-src-comment"># Pad the synchronization stream.</span>
- <span class="py-src-variable">data</span> = <span class="py-src-string">''</span>.<span class="py-src-variable">join</span>([<span class="py-src-string">'FFFFFFFFFFFF'</span>, <span class="py-src-variable">macaddress</span> * <span class="py-src-number">20</span>])
- <span class="py-src-variable">send_data</span> = <span class="py-src-string">''</span>
-
- <span class="py-src-comment"># Split up the hex values and pack.</span>
- <span class="py-src-keyword">for</span> <span class="py-src-variable">i</span> <span class="py-src-keyword">in</span> <span class="py-src-variable">range</span>(<span class="py-src-number">0</span>, <span class="py-src-variable">len</span>(<span class="py-src-variable">data</span>), <span class="py-src-number">2</span>):
- <span class="py-src-variable">send_data</span> = <span class="py-src-string">''</span>.<span class="py-src-variable">join</span>([<span class="py-src-variable">send_data</span>,
- <span class="py-src-variable">struct</span>.<span class="py-src-variable">pack</span>(<span class="py-src-string">'B'</span>, <span class="py-src-variable">int</span>(<span class="py-src-variable">data</span>[<span class="py-src-variable">i</span>: <span class="py-src-variable">i</span> + <span class="py-src-number">2</span>], <span class="py-src-number">16</span>))])
-
- <span class="py-src-comment"># Broadcast it to the LAN.</span>
- <span class="py-src-variable">sock</span> = <span class="py-src-variable">socket</span>.<span class="py-src-variable">socket</span>(<span class="py-src-variable">socket</span>.<span class="py-src-variable">AF_INET</span>, <span class="py-src-variable">socket</span>.<span class="py-src-variable">SOCK_DGRAM</span>)
- <span class="py-src-variable">sock</span>.<span class="py-src-variable">setsockopt</span>(<span class="py-src-variable">socket</span>.<span class="py-src-variable">SOL_SOCKET</span>, <span class="py-src-variable">socket</span>.<span class="py-src-variable">SO_BROADCAST</span>, <span class="py-src-number">1</span>)
- <span class="py-src-variable">sock</span>.<span class="py-src-variable">sendto</span>(<span class="py-src-variable">send_data</span>, (<span class="py-src-string">'&lt;broadcast&gt;'</span>, <span class="py-src-number">7</span>))
-
-<span class="py-src-keyword">def</span> <span class="py-src-identifier">wolTask</span>(<span class="py-src-parameter">worker</span>, <span class="py-src-parameter">job</span>):
- <span class="py-src-variable">wake_on_lan</span>(<span class="py-src-variable">job</span>.<span class="py-src-variable">data</span>)
- <span class="py-src-keyword">print</span> <span class="py-src-string">'WOL send to: %s'</span> % <span class="py-src-variable">job</span>.<span class="py-src-variable">data</span>
- <span class="py-src-keyword">return</span> <span class="py-src-string">'Magic packet send.\n'</span>
-
-<span class="py-src-variable">worker</span> = <span class="py-src-variable">GearmanWorker</span>([<span class="py-src-string">"127.0.0.1"</span>])
-<span class="py-src-variable">worker</span>.<span class="py-src-variable">register_task</span>(<span class="py-src-string">'wol'</span>, <span class="py-src-variable">wolTask</span>)
-<span class="py-src-keyword">print</span> <span class="py-src-string">'starting wol worker'</span>
-<span class="py-src-variable">worker</span>.<span class="py-src-variable">work</span>()
-</pre>
-</body> \ No newline at end of file