This commit is contained in:
Olivier Duval 2021-02-10 20:54:19 +01:00
commit 63290cd3a2
11 changed files with 556 additions and 0 deletions

51
build.gradle Normal file
View File

@ -0,0 +1,51 @@
plugins {
id 'java'
id 'maven-publish'
}
group 'org.example'
version '1.0-SNAPSHOT'
repositories {
mavenCentral()
}
dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
}
test {
useJUnitPlatform()
}
def privatePropertiesFile = rootProject.file("private.properties");
def privateProperties = new Properties()
privateProperties.load(new FileInputStream(privatePropertiesFile))
def getDate() {
def date = new Date()
def formattedDate = date.format('yyMMddHHmm')
return formattedDate
}
publishing {
publications {
mavenJava(MavenPublication) {
groupId = 'fr.doap.dlog'
artifactId = 'dlog'
version = "0.9.4-SNAPSHOT"
from components.java
}
}
repositories {
maven {
// url = "https://maven.doap.fr/repository/maven-releases/"
url = "https://maven.doap.fr/repository/maven-snapshots/"
credentials {
username privateProperties["mavenUsername"]
password privateProperties["mavenPassword"]
}
}
}
}

185
gradlew vendored Normal file
View File

@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed 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
#
# https://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.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

89
gradlew.bat vendored Normal file
View File

@ -0,0 +1,89 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

2
private.properties Normal file
View File

@ -0,0 +1,2 @@
mavenUsername=admin
mavenPassword=mavenLouA0112

2
settings.gradle Normal file
View File

@ -0,0 +1,2 @@
rootProject.name = 'Llog'

View File

@ -0,0 +1,6 @@
package fr.doap.llog;
public interface ILogger {
public void log(LogMsg aLogMsg);
}

View File

@ -0,0 +1,18 @@
package fr.doap.llog;
public class L {
static private L mL = new L();
static public LogMsg l(int aSeverity, Throwable aThrowable, String aTag, String aMsg, Object ... aArgs) {
String lMsg = aMsg;
if (aArgs != null && aArgs.length > 0) lMsg = String.format(aMsg, aArgs);
LogMsg lLogMsg = new LogMsg(aSeverity, aThrowable, aTag, lMsg);
mL.mLooper.post(lLogMsg);
return lLogMsg;
}
private LogLooper mLooper = new LogLooper();
private ILogger mLogger;
}

View File

@ -0,0 +1,22 @@
package fr.doap.llog;
public class LogLooper extends ThreadLooper {
public void post(LogMsg aLogMsg) {
add(new LLMsg(aLogMsg));
}
public class LLMsg implements WorkItem {
public LLMsg(LogMsg aLogMsg) { mLogMsg = aLogMsg; }
@Override
public void run() {
for (int i=mLogMsg.getCallerIndex(); i<mLogMsg.mSTE.length; i++) {
StackTraceElement lS = mLogMsg.mSTE[i];
System.out.println(lS.getClassName() + "." + lS.getMethodName() + ": " + mLogMsg.mMessage + " (" + lS.getFileName() + ":" + lS.getLineNumber() + ")");
}
}
private LogMsg mLogMsg;
}
}

View File

@ -0,0 +1,32 @@
package fr.doap.llog;
public class LogMsg {
public long mTime;
public Throwable mThrowable;
public Thread mCallerThread;
public String mMessage;
public int mSeverity;
public String mTag;
public StackTraceElement[] mSTE;
public LogMsg(int aSeverity, Throwable aThrowable, String aTag, String aMsg) {
mTime = System.currentTimeMillis();
mThrowable = aThrowable;
mCallerThread = Thread.currentThread();
mMessage = aMsg;
mTag = aTag;
mSeverity = aSeverity;
mSTE = Thread.currentThread().getStackTrace();
}
public int getCallerIndex() {
int lI = mSTE.length-1;
while (!mSTE[lI].getClassName().startsWith("fr.doap.llog.") && lI>=0) lI--;
return lI+1;
}
}

View File

@ -0,0 +1,134 @@
package fr.doap.llog;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
public class ThreadLooper {
public interface WorkItem {
void run();
}
public void add(WorkItem aWorkItem) {
if (mLooperThread == null) createThreadLooper();
Thread thread = Thread.currentThread();
if (!mCallerThreads.contains(thread)&&(!thread.isDaemon())) addCallerThread(thread);
mMessageQueue.add(aWorkItem);
if (!mFlushing) {
synchronized (this) {
notify();
}
}
}
protected void onThreadInit() {}
protected void onBeforeFlush() {}
protected void onStartWaiting() {}
protected void onShutdownThread() {}
protected void onUncaughtException(Thread t, Throwable e) {
/*
L.e("Uncaught Exception '"+e+"' in thread '"+t.getName()+"' : flushing...");
L.e("Uncaught Exception '"+e.getMessage()+"' in thread '"+t.getName()+"' : flushing...");
L.e("Uncaught Exception '"+e.getLocalizedMessage()+"' in thread '"+t.getName()+"' : flushing...");
*/
System.out.println("Caller threads : "+ mCallerThreads);
System.out.println("Removing "+t);
mCallerThreads.remove(t);
mLooperThread.interrupt();
if (e.getCause() != null) System.out.println("Cause: "+e.getCause());
e.printStackTrace();
}
protected synchronized void createThreadLooper() {
mLooperThread = new Thread(new Runnable(){
@Override
public void run() {
onThreadInit();
while (!Thread.currentThread().isInterrupted()) {
flushAll();
synchronized (ThreadLooper.this) {
try {
mFlushing = false;
onStartWaiting();
ThreadLooper.this.wait();
} catch(InterruptedException e) {
System.out.println("Interrupted");
System.out.println("Caller threads: "+ mCallerThreads);
if (mCallerThreads.isEmpty()) Thread.currentThread().interrupt();
}
}
}
flushAll();
onShutdownThread();
mLooperThread = null;
}
});
mLooperThread.setName(getClass().getSimpleName()+"-"+hashCode());
mLooperThread.start();
}
private void flushAll() {
if (!mFlushing) {
mFlushing = true;
onBeforeFlush();
while (!mMessageQueue.isEmpty()) {
WorkItem lWorkItem = mMessageQueue.poll();
lWorkItem.run();
}
}
mFlushing = false;
}
private void addCallerThread(Thread t) {
mCallerThreads.add(t);
new CustomUncaughtExceptionHandler(t);
Thread join = new Thread() {
@Override
public void run() {
try {
t.join();
} catch (InterruptedException e) {}
mCallerThreads.remove(t);
if ((mLooperThread != null)&&!mLooperThread.isInterrupted()) mLooperThread.interrupt();
}
};
join.setName("Finalizer-"+getClass().getSimpleName()+"-"+hashCode());
join.start();
}
private Thread mLooperThread;
private ConcurrentLinkedQueue<WorkItem> mMessageQueue = new ConcurrentLinkedQueue<>();
private Set<Thread> mCallerThreads = new HashSet<>();
private boolean mFlushing = false;
/**
* Classe pour les UncaughtExceptionHandler
*/
private class CustomUncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
public CustomUncaughtExceptionHandler(Thread t) {
mUncaughtExceptionHandler = t.getUncaughtExceptionHandler();
t.setUncaughtExceptionHandler(this);
}
@Override
public void uncaughtException(Thread t, Throwable e) {
onUncaughtException(t, e);
flushAll();
mCallerThreads.remove(t);
if ((mLooperThread != null)&&!mLooperThread.isInterrupted()) mLooperThread.interrupt();
if (mUncaughtExceptionHandler != null) mUncaughtExceptionHandler.uncaughtException(t, e);
}
private Thread.UncaughtExceptionHandler mUncaughtExceptionHandler;
}
}

View File

@ -0,0 +1,15 @@
package fr.doap.test;
import fr.doap.llog.L;
public class Test {
public static void main(String[] args) {
L.l(1, null, "test", "Message sans format");
test1();
}
protected static void test1() {
L.l(1, null, "test", "Message avec format: %s", "toto");
}
}