Skip to content

Convert logging related gradle classes to java #44771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ public class BatsOverVagrantTask extends VagrantCommandTask {

@Override
protected OutputStream createLoggerOutputStream() {
return new TapLoggerOutputStream(
command: commandLine.join(' '),
factory: getProgressLoggerFactory(),
logger: logger)
return new TapLoggerOutputStream(logger, getProgressLoggerFactory().newOperation(boxName).setDescription(boxName));
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,9 @@ public class VagrantCommandTask extends LoggedExec {
}

protected OutputStream createLoggerOutputStream() {
return new VagrantLoggerOutputStream(
command: commandLine.join(' '),
factory: getProgressLoggerFactory(),
return new VagrantLoggerOutputStream(getProgressLoggerFactory().newOperation(boxName + " " + command).setDescription(boxName),
/* Vagrant tends to output a lot of stuff, but most of the important
stuff starts with ==> $box */
squashedPrefix: "==> $boxName: ")
"==> $boxName: ")
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.elasticsearch.gradle;

import java.io.IOException;
import java.io.OutputStream;
import java.util.Arrays;

/**
* Writes data passed to this stream as log messages.
*
* The stream will be flushed whenever a newline is detected.
* Allows setting an optional prefix before each line of output.
*/
public abstract class LoggingOutputStream extends OutputStream {
/** The starting length of the buffer */
private static final int DEFAULT_BUFFER_LENGTH = 4096;

/** The buffer of bytes sent to the stream */
private byte[] buffer = new byte[DEFAULT_BUFFER_LENGTH];

/** Offset of the start of unwritten data in the buffer */
private int start = 0;

/** Offset of the end (semi-open) of unwritten data in the buffer */
private int end = 0;

@Override
public void write(final int b) throws IOException {
if (b == 0) return;
if (b == '\n') {
// always flush with newlines instead of adding to the buffer
flush();
return;
}

if (end == buffer.length) {
if (start != 0) {
// first try shifting the used buffer back to the beginning to make space
int len = end - start;
System.arraycopy(buffer, start, buffer, 0, len);
start = 0;
end = len;
} else {
// otherwise extend the buffer
buffer = Arrays.copyOf(buffer, buffer.length + DEFAULT_BUFFER_LENGTH);
}
}

buffer[end++] = (byte) b;
}

@Override
public void flush() {
if (end == start) return;
logLine(new String(buffer, start, end - start));
start = end;
}

protected abstract void logLine(String line);
}
Loading