-
Notifications
You must be signed in to change notification settings - Fork 25.2k
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
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
64 changes: 0 additions & 64 deletions
64
buildSrc/src/main/groovy/org/elasticsearch/gradle/LoggingOutputStream.groovy
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 0 additions & 111 deletions
111
buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/TapLoggerOutputStream.groovy
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 0 additions & 101 deletions
101
buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantLoggerOutputStream.groovy
This file was deleted.
Oops, something went wrong.
80 changes: 80 additions & 0 deletions
80
buildSrc/src/main/java/org/elasticsearch/gradle/LoggingOutputStream.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* 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; | ||
|
||
/** | ||
* 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 | ||
final int newBufferLength = buffer.length + DEFAULT_BUFFER_LENGTH; | ||
final byte[] newBuffer = new byte[newBufferLength]; | ||
System.arraycopy(buffer, 0, newBuffer, 0, buffer.length); | ||
buffer = newBuffer; | ||
} | ||
} | ||
|
||
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); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be simplified a bit with
Arrays.copyOf()