You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/20 11:30:56 UTC
openmeetings git commit: [OPENMEETINGS-1723] logging is improved
Repository: openmeetings
Updated Branches:
refs/heads/master 26c75a411 -> 554255aba
[OPENMEETINGS-1723] logging is improved
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/554255ab
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/554255ab
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/554255ab
Branch: refs/heads/master
Commit: 554255aba52ece17b14ab2d1a87faab4f5176b1a
Parents: 26c75a4
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 20 18:30:49 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 20 18:30:49 2017 +0700
----------------------------------------------------------------------
.../core/converter/BaseConverter.java | 8 +++----
.../core/converter/RecordingConverter.java | 9 +++----
.../core/service/RecordingService.java | 25 ++++++++++++--------
3 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/554255ab/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 5ba2a97..2417593 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -188,12 +188,12 @@ public abstract class BaseConverter {
public static void printMetaInfo(RecordingMetaData metaData, String prefix) {
if (log.isDebugEnabled()) {
- log.debug(String.format("### %s:: recording id %s; stream with id %s; current status: %s ", prefix, metaData.getRecording().getId()
- , metaData.getId(), metaData.getStreamStatus()));
+ log.debug("### {}:: recording id {}; stream with id {}; current status: {} ", prefix, metaData.getRecording().getId()
+ , metaData.getId(), metaData.getStreamStatus());
File metaFlv = getRecordingMetaData(metaData.getRecording().getRoomId(), metaData.getStreamName());
File metaSer = getMetaFlvSer(metaData);
- log.debug(String.format("### %s:: Flv file [%s] exists ? %s; size: %s, lastModified: %s ", prefix, metaFlv.getPath(), metaFlv.exists(), metaFlv.length(), metaFlv.lastModified()));
- log.debug(String.format("### %s:: Ser file [%s] exists ? %s; size: %s, lastModified: %s ", prefix, metaSer.getPath(), metaSer.exists(), metaSer.length(), metaSer.lastModified()));
+ log.debug("### {}:: Flv file [{}] exists ? {}; size: {}, lastModified: {} ", prefix, metaFlv.getPath(), metaFlv.exists(), metaFlv.length(), metaFlv.lastModified());
+ log.debug("### {}:: Ser file [{}] exists ? {}; size: {}, lastModified: {} ", prefix, metaSer.getPath(), metaSer.exists(), metaSer.length(), metaSer.lastModified());
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/554255ab/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
index 9b34304..5e62535 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
@@ -73,6 +73,7 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve
}
if (screenMetaData.getStreamStatus() == Status.NONE) {
+ printMetaInfo(screenMetaData, "StartConversion");
throw new ConversionException("Stream has not been started, error in recording");
}
if (Strings.isEmpty(r.getHash())) {
@@ -120,14 +121,14 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve
int flvWidth = r.getWidth();
int flvHeight = r.getHeight();
- log.debug("flvWidth -1- " + flvWidth);
- log.debug("flvHeight -1- " + flvHeight);
+ log.debug("flvWidth -1- {}", flvWidth);
+ log.debug("flvHeight -1- {}", flvHeight);
flvWidth = (int)(16. * flvWidth / 16);
flvHeight = (int)(16. * flvHeight / 16);
- log.debug("flvWidth -2- " + flvWidth);
- log.debug("flvHeight -2- " + flvHeight);
+ log.debug("flvWidth -2- {}", flvWidth);
+ log.debug("flvHeight -2- {}", flvHeight);
r.setWidth(flvWidth);
r.setHeight(flvHeight);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/554255ab/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
index 6a1ffbd..0b1b86b 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.service;
+import static org.apache.openmeetings.core.converter.BaseConverter.printMetaInfo;
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.getApp;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
@@ -27,7 +28,6 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.openmeetings.IApplication;
-import org.apache.openmeetings.core.converter.BaseConverter;
import org.apache.openmeetings.core.data.record.converter.InterviewConverterTask;
import org.apache.openmeetings.core.data.record.converter.RecordingConverterTask;
import org.apache.openmeetings.core.data.record.listener.StreamListener;
@@ -271,20 +271,25 @@ public class RecordingService {
log.debug("Stream Closing :: " + metaId);
RecordingMetaData metaData = metaDataDao.get(metaId);
- BaseConverter.printMetaInfo(metaData, "Stopping the stream");
+ printMetaInfo(metaData, "Stopping the stream");
// Manually call finish on the stream so that there is no endless loop waiting in the RecordingConverter waiting for the stream to finish
// this would normally happen in the Listener
Status s = metaData.getStreamStatus();
- if (Status.NONE == s) {
- log.debug("Stream was not started, no need to stop :: stream with id {}", metaId);
- } else {
- metaData.setStreamStatus(listenerAdapter == null && s == Status.STARTED ? Status.STOPPED : Status.STOPPING);
- log.debug("Stopping the stream :: New status == {}", metaData.getStreamStatus());
+ switch (s) {
+ case NONE:
+ log.debug("Stream was not started, no need to stop :: stream with id {}", metaId);
+ break;
+ case STARTED:
+ metaData.setStreamStatus(listenerAdapter == null ? Status.STOPPED : Status.STOPPING);
+ metaDataDao.update(metaData);
+ break;
+ default:
+ //no-op
+ break;
}
- metaDataDao.update(metaData);
if (listenerAdapter == null) {
- log.debug("Stream Not Found :: " + metaId);
- log.debug("Available Streams :: " + streamListeners.size());
+ log.debug("Stream Not Found :: {}", metaId);
+ log.debug("Available Streams :: {}", streamListeners.size());
for (Long entryKey : streamListeners.keySet()) {
log.debug("Stored recordingMetaDataId in Map: {}", entryKey);