Author: solomax
Date: Tue Apr 29 07:02:14 2014
New Revision: 1590885
URL: http://svn.apache.org/r1590885
Log:
Logging is improved; Full message size in recording log is increased
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java?rev=1590885&r1=1590884&r2=1590885&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
Tue Apr 29 07:02:14 2014
@@ -57,7 +57,7 @@ public class FlvRecordingLog implements
private String msgType;
@Lob
- @Column(name="ful_message")
+ @Column(name="ful_message", length = 1 * 1024 * 1024)
private String fullMessage;
@Column(name="exit_value")
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1590885&r1=1590884&r2=1590885&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Tue Apr 29 07:02:14 2014
@@ -156,13 +156,13 @@ public abstract class BaseConverter {
if (metaData.getStreamStatus() ==
Status.STOPPED) {
log.debug("### Stream now written
Thread continue - " );
doWait = false;
- } else if (++counter % 1000 == 0) {
+ } else if (++counter % 1 == 0) {
log.debug(String.format("### Still
waiting for the stream with id %s; current status: %s ", metaId,
metaData.getStreamStatus()));
- File metaDir =
getStreamsSubDir(metaData.getFlvRecording().getFlvRecordingId());
+ File metaDir =
getStreamsSubDir(metaData.getFlvRecording().getRoom_id());
File metaFlv = new File(metaDir,
metaData.getStreamName() + ".flv");
File metaSer = new File(metaDir,
metaData.getStreamName() + ".flv.ser");
- log.debug(String.format("### Still
waiting:: Flv file exists ? %s; size: %s, lastModified: %s ", metaFlv.exists(),
metaFlv.length(), metaFlv.lastModified()));
- log.debug(String.format("### Still
waiting:: Ser file exists ? %s; size: %s, lastModified: %s ", metaSer.exists(),
metaSer.length(), metaSer.lastModified()));
+ log.debug(String.format("### Still
waiting:: Flv file [%s] exists ? %s; size: %s, lastModified: %s ",
metaFlv.getPath(), metaFlv.exists(), metaFlv.length(), metaFlv.lastModified()));
+ log.debug(String.format("### Still
waiting:: Ser file [%s] exists ? %s; size: %s, lastModified: %s ",
metaSer.getPath(), metaSer.exists(), metaSer.length(), metaSer.lastModified()));
}
Thread.sleep(100L);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1590885&r1=1590884&r2=1590885&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Tue Apr 29 07:02:14 2014
@@ -158,11 +158,11 @@ public abstract class BaseConverter {
doWait = false;
} else if (++counter % 1000 == 0) {
log.debug(String.format("### Still
waiting for the stream with id %s; current status: %s ", metaId,
metaData.getStreamStatus()));
- File metaDir =
getStreamsSubDir(metaData.getFlvRecording().getFlvRecordingId());
+ File metaDir =
getStreamsSubDir(metaData.getFlvRecording().getRoom_id());
File metaFlv = new File(metaDir,
metaData.getStreamName() + ".flv");
File metaSer = new File(metaDir,
metaData.getStreamName() + ".flv.ser");
- log.debug(String.format("### Still
waiting:: Flv file exists ? %s; size: %s, lastModified: %s ", metaFlv.exists(),
metaFlv.length(), metaFlv.lastModified()));
- log.debug(String.format("### Still
waiting:: Ser file exists ? %s; size: %s, lastModified: %s ", metaSer.exists(),
metaSer.length(), metaSer.lastModified()));
+ log.debug(String.format("### Still
waiting:: Flv file [%s] exists ? %s; size: %s, lastModified: %s ",
metaFlv.getPath(), metaFlv.exists(), metaFlv.length(), metaFlv.lastModified()));
+ log.debug(String.format("### Still
waiting:: Ser file [%s] exists ? %s; size: %s, lastModified: %s ",
metaSer.getPath(), metaSer.exists(), metaSer.length(), metaSer.lastModified()));
}
Thread.sleep(100L);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java?rev=1590885&r1=1590884&r2=1590885&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingLog.java
Tue Apr 29 07:02:14 2014
@@ -57,7 +57,7 @@ public class FlvRecordingLog implements
private String msgType;
@Lob
- @Column(name="ful_message")
+ @Column(name="full_message", length = 1 * 1024 * 1024)
private String fullMessage;
@Column(name="exit_value")
