diff --git a/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml b/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
index 4ce78c76d0293da4e9ff73ecdbbdaaf9c3a81c03..f5b6078f636a1ddf9a0364b9281fec3a3a0b4370 100644
--- a/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
+++ b/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
@@ -43,6 +43,7 @@ How to add a new job:
<ref bean="epDeadlineTrigger" />
<ref bean="restTokenTrigger" />
<ref bean="taskExecutorTrigger" />
+ <ref bean="procSamplerTrigger"/>
<ref bean="systemSamplerTrigger"/>
<ref bean="updateQtiResultsTriggerOnyx"/>
<ref bean="acReservationCleanupJob"/>
diff --git a/src/main/java/org/olat/core/commons/services/taskexecutor/manager/ExecutorJob.java b/src/main/java/org/olat/core/commons/services/taskexecutor/manager/ExecutorJob.java
index 2e5c7ffa4d806615038150405da1183b0c7e48ec..48652e0995e80b905269040e8b860e525f157294 100644
--- a/src/main/java/org/olat/core/commons/services/taskexecutor/manager/ExecutorJob.java
+++ b/src/main/java/org/olat/core/commons/services/taskexecutor/manager/ExecutorJob.java
@@ -39,7 +39,6 @@ public class ExecutorJob extends JobWithDB {
@Override
public void executeWithDB(JobExecutionContext context) {
try {
- log.info("Starting checking task to do");
CoreSpringFactory.getImpl(TaskExecutorManagerImpl.class).processTaskToDo();
} catch (Exception e) {
// ups, something went completely wrong! We log this but continue next time
diff --git a/src/main/java/org/olat/restapi/_spring/restApiContext.xml b/src/main/java/org/olat/restapi/_spring/restApiContext.xml
index 9da082a11d021ef052db36523f8fa662278f9b33..8cb6330d16e1a75b4b6175146c37d93a1555ec07 100644
--- a/src/main/java/org/olat/restapi/_spring/restApiContext.xml
+++ b/src/main/java/org/olat/restapi/_spring/restApiContext.xml
@@ -74,6 +74,17 @@
<property name="jobClass" value="org.olat.restapi.system.SamplerJob" />
</bean>
+ <bean id="procSamplerTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
+ <property name="jobDetail" ref="procSamplerJob" />
+ <property name="cronExpression" value="5 3,8,13,18,23,28,33,38,43,48,53,58 * * * ?" />
+ <property name="startDelay" value="30000" />
+ </bean>
+
+ <bean id="procSamplerJob" class="org.springframework.scheduling.quartz.JobDetailBean">
+ <property name="jobClass" value="org.olat.restapi.system.ProcSamplerJob" />
+ </bean>
+
+
<!-- Deadline Job -->
<bean id="restTokenTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean">
<property name="jobDetail" ref="restTokenJob.${cluster.singleton.services}" />
diff --git a/src/main/java/org/olat/restapi/system/ProcSamplerJob.java b/src/main/java/org/olat/restapi/system/ProcSamplerJob.java
new file mode 100644
index 0000000000000000000000000000000000000000..c32ec0149e191b0948d87913262d08f0bfbc6db9
--- /dev/null
+++ b/src/main/java/org/olat/restapi/system/ProcSamplerJob.java
@@ -0,0 +1,152 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.restapi.system;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Date;
+import java.util.Random;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.olat.core.CoreSpringFactory;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
+import org.olat.core.util.StringHelper;
+import org.olat.restapi.system.MonitoringService.Statistics;
+import org.olat.restapi.system.vo.SessionsVO;
+import org.quartz.JobExecutionContext;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+/**
+ *
+ * Initial date: 27 févr. 2017<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class ProcSamplerJob extends QuartzJobBean {
+
+ private static final OLog log = Tracing.createLoggerFor(ProcSamplerJob.class);
+ private final Random random = new Random();
+
+ @Override
+ protected void executeInternal(JobExecutionContext context) {
+ MonitoringModule monitoringModule = CoreSpringFactory.getImpl(MonitoringModule.class);
+ if(StringHelper.containsNonWhitespace(monitoringModule.getProcFile())) {
+ File xmlFile = new File(monitoringModule.getProcFile());
+ if(!xmlFile.exists()) {
+ File parent = xmlFile.getParentFile();
+ if(!parent.exists() || !parent.canWrite()) {
+ return;
+ }
+ } else if(!xmlFile.canWrite()) {
+ return;
+ }
+ jitter();
+ writeProcFile(xmlFile);
+ }
+ }
+
+ private void jitter() {
+ try {
+ double millis = random.nextDouble() * 6000.0d;
+ long wait = Math.round(millis);
+ Thread.sleep(wait);
+ System.out.println(wait + " " + new Date());
+ } catch (InterruptedException e) {
+ log.error("", e);
+ }
+ }
+
+ public void writeProcFile(File xmlFile) {
+ try {
+ Statistics statistics = CoreSpringFactory.getImpl(MonitoringService.class).getStatistics();
+ DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+ Document doc;
+ if(xmlFile.exists()) {
+ doc = dBuilder.parse(xmlFile);
+ } else {
+ doc = dBuilder.newDocument();
+ doc.appendChild(doc.createElement("root"));
+ }
+
+ Element rootEl = doc.getDocumentElement();
+ //sessions
+ SessionsVO sessionsVo = statistics.getSessionsVo();
+ addValue("secureAuthenticatedCount", sessionsVo.getSecureAuthenticatedCount(), rootEl, doc);
+ addValue("secureRestCount", sessionsVo.getSecureRestCount(), rootEl, doc);
+ addValue("secureWebdavCount", sessionsVo.getSecureWebdavCount(), rootEl, doc);
+ //clicks
+ addValue("authenticatedClickCountLastFiveMinutes", sessionsVo.getAuthenticatedClickCountLastFiveMinutes(), rootEl, doc);
+ addValue("concurrentDispatchThreads", sessionsVo.getConcurrentDispatchThreads(), rootEl, doc);
+ addValue("requestLastFiveMinutes", sessionsVo.getRequestLastFiveMinutes(), rootEl, doc);
+ addValue("requestLastMinute", sessionsVo.getRequestLastMinute(), rootEl, doc);
+ //openolat
+ addValue("activeUserCount", statistics.getActiveUserCount(), rootEl, doc);
+ addValue("totalGroupCount", statistics.getTotalGroupCount(), rootEl, doc);
+ addValue("publishedCourses", statistics.getPublishedCourses(), rootEl, doc);
+ //indexer
+ addValue("lastFullIndexTime", statistics.getLastFullIndexTime(), rootEl, doc);
+ //marker
+ addValue("lastOpenOLATSampling", new Date().toString(), rootEl, doc);
+
+ // Use a Transformer for output
+ try(OutputStream out = new FileOutputStream(xmlFile)) {
+ TransformerFactory tFactory = TransformerFactory.newInstance();
+ Transformer transformer = tFactory.newTransformer();
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+ transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "5");
+ transformer.transform(new DOMSource(doc), new StreamResult(out));
+ } catch(IOException e) {
+ log.error("", e);
+ }
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+
+ private void addValue(String name, long value, Element rootEl, Document doc) {
+ addValue(name, Long.toString(value), rootEl, doc);
+ }
+
+ private void addValue(String name, String value, Element rootEl, Document doc) {
+ NodeList currentEls = rootEl.getElementsByTagName(name);
+ if(currentEls.getLength() == 0) {
+ Element element = doc.createElement(name);
+ element.setAttribute("value", value);
+ rootEl.appendChild(element);
+ } else {
+ Element element = (Element)currentEls.item(0);
+ element.setAttribute("value", value);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/olat/restapi/system/SamplerJob.java b/src/main/java/org/olat/restapi/system/SamplerJob.java
index 20a84a76b1ccbd0420d2d535d5562d5243c176ff..7657ec18675be2d8d02bd4d88cced92be4f06eef 100644
--- a/src/main/java/org/olat/restapi/system/SamplerJob.java
+++ b/src/main/java/org/olat/restapi/system/SamplerJob.java
@@ -19,29 +19,8 @@
*/
package org.olat.restapi.system;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.logging.OLog;
-import org.olat.core.logging.Tracing;
-import org.olat.core.util.StringHelper;
-import org.olat.restapi.system.MonitoringService.Statistics;
-import org.olat.restapi.system.vo.SessionsVO;
import org.quartz.JobExecutionContext;
import org.springframework.scheduling.quartz.QuartzJobBean;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
/**
*
@@ -56,84 +35,8 @@ import org.w3c.dom.NodeList;
*/
public class SamplerJob extends QuartzJobBean {
- private static final OLog log = Tracing.createLoggerFor(SamplerJob.class);
-
@Override
protected void executeInternal(JobExecutionContext context) {
MonitoringWebService.takeSample();
- MonitoringModule monitoringModule = CoreSpringFactory.getImpl(MonitoringModule.class);
- if(StringHelper.containsNonWhitespace(monitoringModule.getProcFile())) {
- writeProcFile(monitoringModule.getProcFile());
- }
- }
-
- public void writeProcFile(String procFile) {
- try {
- File xmlFile = new File(procFile);
- if(!xmlFile.exists()) {
- File parent = xmlFile.getParentFile();
- if(!parent.exists() || !parent.canWrite()) {
- return;
- }
- } else if(!xmlFile.canWrite()) {
- return;
- }
-
- Statistics statistics = CoreSpringFactory.getImpl(MonitoringService.class).getStatistics();
- DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
- Document doc;
- if(xmlFile.exists()) {
- doc = dBuilder.parse(xmlFile);
- } else {
- doc = dBuilder.newDocument();
- doc.appendChild(doc.createElement("root"));
- }
-
- Element rootEl = doc.getDocumentElement();
- //sessions
- SessionsVO sessionsVo = statistics.getSessionsVo();
- addValue("secureAuthenticatedCount", sessionsVo.getSecureAuthenticatedCount(), rootEl, doc);
- addValue("secureRestCount", sessionsVo.getSecureRestCount(), rootEl, doc);
- addValue("secureWebdavCount", sessionsVo.getSecureWebdavCount(), rootEl, doc);
- //clicks
- addValue("authenticatedClickCountLastFiveMinutes", sessionsVo.getAuthenticatedClickCountLastFiveMinutes(), rootEl, doc);
- addValue("concurrentDispatchThreads", sessionsVo.getConcurrentDispatchThreads(), rootEl, doc);
- addValue("requestLastFiveMinutes", sessionsVo.getRequestLastFiveMinutes(), rootEl, doc);
- addValue("requestLastMinute", sessionsVo.getRequestLastMinute(), rootEl, doc);
- //openolat
- addValue("activeUserCount", statistics.getActiveUserCount(), rootEl, doc);
- addValue("totalGroupCount", statistics.getTotalGroupCount(), rootEl, doc);
- addValue("publishedCourses", statistics.getPublishedCourses(), rootEl, doc);
- //indexer
- addValue("lastFullIndexTime", statistics.getLastFullIndexTime(), rootEl, doc);
-
- // Use a Transformer for output
- try(OutputStream out = new FileOutputStream(xmlFile)) {
- TransformerFactory tFactory = TransformerFactory.newInstance();
- Transformer transformer = tFactory.newTransformer();
- transformer.transform(new DOMSource(doc), new StreamResult(out));
- } catch(IOException e) {
- log.error("", e);
- }
- } catch (Exception e) {
- log.error("", e);
- }
- }
-
- private void addValue(String name, long value, Element rootEl, Document doc) {
- addValue(name, Long.toString(value), rootEl, doc);
- }
-
- private void addValue(String name, String value, Element rootEl, Document doc) {
- NodeList currentEls = rootEl.getElementsByTagName(name);
- if(currentEls.getLength() == 0) {
- Element element = doc.createElement(name);
- element.setAttribute("value", value);
- rootEl.appendChild(element);
- } else {
- Element element = (Element)currentEls.item(0);
- element.setAttribute("value", value);
- }
}
}
\ No newline at end of file