Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-haz
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-haz
Commits
eee992f0
Commit
eee992f0
authored
7 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
moved logging.props; always in src root now
parent
7f8ceb08
No related branches found
No related tags found
1 merge request
!242
To gradle build 240
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/gov/usgs/earthquake/nshmp/internal/Logging.java
+0
-8
0 additions, 8 deletions
src/gov/usgs/earthquake/nshmp/internal/Logging.java
src/logging.properties
+0
-0
0 additions, 0 deletions
src/logging.properties
with
0 additions
and
8 deletions
src/gov/usgs/earthquake/nshmp/internal/Logging.java
+
0
−
8
View file @
eee992f0
...
@@ -6,7 +6,6 @@ import static java.util.logging.Level.SEVERE;
...
@@ -6,7 +6,6 @@ import static java.util.logging.Level.SEVERE;
import
com.google.common.base.Strings
;
import
com.google.common.base.Strings
;
import
com.google.common.base.Throwables
;
import
com.google.common.base.Throwables
;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
import
java.util.logging.Formatter
;
import
java.util.logging.Formatter
;
...
@@ -28,14 +27,7 @@ public class Logging {
...
@@ -28,14 +27,7 @@ public class Logging {
*/
*/
public
static
void
init
()
{
public
static
void
init
()
{
try
{
try
{
/*
* When running from a jar, logging.properties will have been moved to the
* root of the source directory, otherwise it can be found in lib.
*/
InputStream
is
=
Logging
.
class
.
getResourceAsStream
(
"/logging.properties"
);
InputStream
is
=
Logging
.
class
.
getResourceAsStream
(
"/logging.properties"
);
if
(
is
==
null
)
{
is
=
new
FileInputStream
(
"lib/logging.properties"
);
}
LogManager
.
getLogManager
().
readConfiguration
(
is
);
LogManager
.
getLogManager
().
readConfiguration
(
is
);
}
catch
(
IOException
ioe
)
{
}
catch
(
IOException
ioe
)
{
ioe
.
printStackTrace
();
ioe
.
printStackTrace
();
...
...
This diff is collapsed.
Click to expand it.
lib
/logging.properties
→
src
/logging.properties
+
0
−
0
View file @
eee992f0
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment