summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-11 16:28:31 +0200
committerBjörn Geiger2011-10-11 16:28:31 +0200
commitb3f7bbb57cfb25b39af68ce208d9fbf78d26c4ba (patch)
treee19d2abbdb22be3f1fef0270584ac63cef9e17b1
parentkleine Korrektur (diff)
downloadpoolctrl-b3f7bbb57cfb25b39af68ce208d9fbf78d26c4ba.tar.gz
poolctrl-b3f7bbb57cfb25b39af68ce208d9fbf78d26c4ba.tar.xz
poolctrl-b3f7bbb57cfb25b39af68ce208d9fbf78d26c4ba.zip
minor
-rwxr-xr-xapplication/controllers/EventController.php4
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/PoolctrlRequest.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 2dae036..c43c2f2 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -1218,7 +1218,7 @@ class EventController extends Zend_Controller_Action
}
}
if(count($results) <= 0) {
- $results = array("No current events available");
+ $results = array("No current events to run available");
}
$resultString = json_encode($results);
header('Content-Type: application/json');
@@ -1385,7 +1385,7 @@ class EventController extends Zend_Controller_Action
}
}
if(count($results) <= 0) {
- $results = array("No current events available");
+ $results = array("No current events to report available");
}
$resultString = json_encode($results);
header('Content-Type: application/json');
diff --git a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
index 69fe7bf..0aa003c 100755
--- a/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
+++ b/gearman/controllerWorker/ControllerWorker/PoolctrlRequest.java
@@ -62,7 +62,7 @@ public class PoolctrlRequest extends Thread {
StringBuilder sb = null;
String line = null;
try {
- connection = (HttpURLConnection) runURL.openConnection();
+ connection = (HttpURLConnection) reportURL.openConnection();
connection.setRequestMethod("GET");
connection.setDoOutput(true);
connection.connect();
@@ -74,7 +74,7 @@ public class PoolctrlRequest extends Thread {
sb.append(line + '\n');
}
logger.info(sb.toString());
- connection = (HttpURLConnection) reportURL.openConnection();
+ connection = (HttpURLConnection) runURL.openConnection();
connection.setRequestMethod("GET");
connection.setDoOutput(true);
connection.connect();