This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 97149ed NETBEANS-3042 Fixes Payara Server log formatting issue
new 4bac07f Merge pull request #3260 from jGauravGupta/NETBEANS-3042
97149ed is described below
commit 97149ed56ec0ffa1a696d2ba49774b8a3a83e7ea
Author: Gaurav Gupta <gaurav.gu...@payara.fish>
AuthorDate: Fri Oct 22 15:26:47 2021 +0530
NETBEANS-3042 Fixes Payara Server log formatting issue
---
.../src/org/netbeans/modules/payara/common/LogViewMgr.java | 11 +++++------
.../src/org/netbeans/modules/payara/common/StartTask.java | 2 +-
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
index b02f5ba..74384b1 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
@@ -173,11 +173,11 @@ public class LogViewMgr {
* Reads a newly included InputSreams.
*
* @param recognizers
- * @param fromFile
+ * @param ignoreEof
* @param instance
* @param serverLogs
*/
- public void readInputStreams(List<Recognizer> recognizers, boolean
fromFile,
+ public void readInputStreams(List<Recognizer> recognizers, boolean
ignoreEof,
PayaraInstance instance, FetchLog... serverLogs) {
synchronized (readers) {
stopReaders();
@@ -185,7 +185,7 @@ public class LogViewMgr {
for(FetchLog serverLog : serverLogs){
// LoggerRunnable will close the stream if necessary.
LoggerRunnable logger = new LoggerRunnable(recognizers,
- serverLog, fromFile, instance);
+ serverLog, ignoreEof, instance);
readers.add(new WeakReference<>(logger));
Thread t = new Thread(logger);
t.start();
@@ -421,9 +421,8 @@ public class LogViewMgr {
// ignoreEof is true for log files and false for process
streams.
// FIXME Should differentiate filter types more cleanly.
- Filter filter = ignoreEof ? new LogFileFilter(localizedLevels)
:
- (uri.contains("]deployer:pfv3ee6") ? new
LogFileFilter(localizedLevels) :new StreamFilter());
-
+ Filter filter = ignoreEof ? new LogFileFilter(localizedLevels)
: new StreamFilter();
+
// read from the input stream and put all the changes to the
I/O window
char [] chars = new char[1024];
int len = 0;
diff --git
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/StartTask.java
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/StartTask.java
index 227dfa1..156829a 100644
---
a/enterprise/payara.common/src/org/netbeans/modules/payara/common/StartTask.java
+++
b/enterprise/payara.common/src/org/netbeans/modules/payara/common/StartTask.java
@@ -545,7 +545,7 @@ public class StartTask extends BasicTask<TaskState> {
// create a logger to the server's output stream so that a user
// can observe the progress
LogViewMgr logger =
LogViewMgr.getInstance(instance.getProperty(PayaraModule.URL_ATTR));
- logger.readInputStreams(recognizers, false, null,
+ logger.readInputStreams(recognizers, true, null,
new FetchLogSimple(instance.getProcess().getInputStream()),
new FetchLogSimple(instance.getProcess().getErrorStream()));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
