Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
ipgallery.common.java
/
utils
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d61577e3
authored
Apr 01, 2020
by
Amir Aharon
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Revert "make changes due to moving to home machine"
This reverts commit
48949ba7
parent
48949ba7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
35 deletions
gradlew
gradlew.bat
src/main/java/common/Log4jFileChangeListener.java
src/main/java/common/configuration/ConfigProperties.java
src/main/java/itm/ITMThread.java
src/main/java/mtqm/MultiThreadQueueManager.java
gradlew
View file @
d61577e3
...
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
...
@@ -28,16 +28,16 @@ APP_NAME="Gradle"
APP_BASE_NAME
=
`
basename
"
$0
"
`
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.
# 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"'
DEFAULT_JVM_OPTS
=
""
# Use the maximum available, or set MAX_FD != -1 to use that value.
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD
=
"maximum"
MAX_FD
=
"maximum"
warn
()
{
warn
(
)
{
echo
"
$*
"
echo
"
$*
"
}
}
die
()
{
die
(
)
{
echo
echo
echo
"
$*
"
echo
"
$*
"
echo
echo
...
@@ -155,7 +155,7 @@ if $cygwin ; then
...
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
fi
# Escape application args
# Escape application args
save
()
{
save
(
)
{
for
i
do
printf
%s
\\
n
"
$i
"
| sed
"s/'/'
\\\\
''/g;1s/^/'/;
\$
s/
\$
/'
\\\\
/"
;
done
for
i
do
printf
%s
\\
n
"
$i
"
| sed
"s/'/'
\\\\
''/g;1s/^/'/;
\$
s/
\$
/'
\\\\
/"
;
done
echo
" "
echo
" "
}
}
...
...
gradlew.bat
View file @
d61577e3
...
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
...
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
set APP_HOME=%DIRNAME%
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
@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"
set DEFAULT_JVM_OPTS=
@rem Find java.exe
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
if defined JAVA_HOME goto findJavaFromJavaHome
...
...
src/main/java/common/Log4jFileChangeListener.java
View file @
d61577e3
...
@@ -77,10 +77,10 @@ public class Log4jFileChangeListener{
...
@@ -77,10 +77,10 @@ public class Log4jFileChangeListener{
}
}
//
@Override
@Override
//
public void destroy()
public
void
destroy
()
//
{
{
//
}
}
...
@@ -128,7 +128,7 @@ public class Log4jFileChangeListener{
...
@@ -128,7 +128,7 @@ public class Log4jFileChangeListener{
{
{
System
.
out
.
println
(
"stopping Log4jFileChangeListener thread..."
);
System
.
out
.
println
(
"stopping Log4jFileChangeListener thread..."
);
// logger.info("stopping Log4jFileChangeListener thread...");
// logger.info("stopping Log4jFileChangeListener thread...");
listenThread
.
stop
();
listenThread
.
destroy
();
listenThread
=
null
;
listenThread
=
null
;
}
}
}
}
...
...
src/main/java/common/configuration/ConfigProperties.java
View file @
d61577e3
...
@@ -106,19 +106,19 @@ public class ConfigProperties
...
@@ -106,19 +106,19 @@ public class ConfigProperties
// }
// }
}
}
//
@Override
@Override
//
public void destroy()
public
void
destroy
()
//
{
{
//
try
try
//
{
{
//
System.out.println("Stopping monitor...");
System
.
out
.
println
(
"Stopping monitor..."
);
//
monitor.stop();
monitor
.
stop
();
//
} catch (Exception e)
}
catch
(
Exception
e
)
//
{
{
//
// TODO Auto-generated catch block
// TODO Auto-generated catch block
//
e.printStackTrace();
e
.
printStackTrace
();
//
}
}
//
}
}
...
@@ -141,7 +141,7 @@ public class ConfigProperties
...
@@ -141,7 +141,7 @@ public class ConfigProperties
protected
void
finalize
()
throws
Throwable
protected
void
finalize
()
throws
Throwable
{
{
// TODO Auto-generated method stub
// TODO Auto-generated method stub
listenThread
.
stop
();
listenThread
.
destroy
();
listenThread
.
join
(
2000
);
listenThread
.
join
(
2000
);
listenThread
=
null
;
listenThread
=
null
;
super
.
finalize
();
super
.
finalize
();
...
@@ -165,7 +165,7 @@ public class ConfigProperties
...
@@ -165,7 +165,7 @@ public class ConfigProperties
{
{
try
try
{
{
listenThread
.
stop
();
listenThread
.
destroy
();
listenThread
.
join
(
2000
);
listenThread
.
join
(
2000
);
}
catch
(
InterruptedException
e
)
}
catch
(
InterruptedException
e
)
{
{
...
...
src/main/java/itm/ITMThread.java
View file @
d61577e3
...
@@ -52,10 +52,12 @@ public abstract class ITMThread extends Thread
...
@@ -52,10 +52,12 @@ public abstract class ITMThread extends Thread
}
}
}
}
// @Override
@Override
// public void destroy()
public
void
destroy
()
// {
{
// }
}
public
void
stopRunning
()
public
void
stopRunning
()
{
{
...
...
src/main/java/mtqm/MultiThreadQueueManager.java
View file @
d61577e3
...
@@ -89,12 +89,12 @@ public class MultiThreadQueueManager
...
@@ -89,12 +89,12 @@ public class MultiThreadQueueManager
}
}
//
@Override
@Override
//
public void destroy()
public
void
destroy
()
//
{
{
//
// TODO Auto-generated method stub
// TODO Auto-generated method stub
//
//
}
}
public
void
stopRunning
()
public
void
stopRunning
()
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment