Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
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
Robert Goldmann
BudgetMaster
Commits
f28f1057
Commit
f28f1057
authored
8 years ago
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
used new logger
parent
5f1e0190
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!104
merge v_1_2_0 into master
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/de/deadlocker8/budgetmaster/main/Main.java
+16
-20
16 additions, 20 deletions
src/de/deadlocker8/budgetmaster/main/Main.java
src/de/deadlocker8/budgetmasterserver/main/Main.java
+3
-2
3 additions, 2 deletions
src/de/deadlocker8/budgetmasterserver/main/Main.java
with
19 additions
and
22 deletions
src/de/deadlocker8/budgetmaster/main/Main.java
+
16
−
20
View file @
f28f1057
package
de.deadlocker8.budgetmaster.main
;
package
de.deadlocker8.budgetmaster.main
;
import
java.io.File
;
import
java.io.File
;
import
java.util.Arrays
;
import
java.util.Locale
;
import
java.util.Locale
;
import
java.util.ResourceBundle
;
import
java.util.ResourceBundle
;
...
@@ -12,7 +11,7 @@ import javafx.scene.Parent;
...
@@ -12,7 +11,7 @@ import javafx.scene.Parent;
import
javafx.scene.Scene
;
import
javafx.scene.Scene
;
import
javafx.scene.image.Image
;
import
javafx.scene.image.Image
;
import
javafx.stage.Stage
;
import
javafx.stage.Stage
;
import
logger.
LogLevel
;
import
logger.
FileOutputMode
;
import
logger.Logger
;
import
logger.Logger
;
import
tools.PathUtils
;
import
tools.PathUtils
;
...
@@ -47,25 +46,22 @@ public class Main extends Application
...
@@ -47,25 +46,22 @@ public class Main extends Application
}
}
}
}
public
static
void
main
(
String
[]
args
)
@Override
{
public
void
init
()
throws
Exception
if
(
Arrays
.
asList
(
args
).
contains
(
"debug"
))
{
Logger
.
setLevel
(
LogLevel
.
ALL
);
Logger
.
info
(
"Running in Debug Mode"
);
}
else
{
{
Logger
.
setLevel
(
LogLevel
.
ERROR
);
Parameters
params
=
getParameters
();
}
String
logLevelParam
=
params
.
getNamed
().
get
(
"loglevel"
);
Logger
.
setLevel
(
logLevelParam
);
PathUtils
.
check
Folder
(
new
File
(
PathUtils
.
getOSindependentPath
()
+
bundle
.
getString
(
"folder"
))
)
;
File
log
Folder
=
new
File
(
PathUtils
.
getOSindependentPath
()
+
bundle
.
getString
(
"folder"
));
File
logFile
=
new
File
(
PathUtils
.
getOSindependentPath
()
+
bundle
.
getString
(
"folder"
)
+
"/error.log"
);
PathUtils
.
checkFolder
(
logFolder
);
Logger
.
enableFileOutput
(
logF
ile
);
Logger
.
enableFileOutput
(
logF
older
,
System
.
out
,
System
.
err
,
FileOutputMode
.
COMBINED
);
Logger
.
appInfo
(
bundle
.
getString
(
"app.name"
),
bundle
.
getString
(
"version.name"
),
bundle
.
getString
(
"version.code"
),
bundle
.
getString
(
"version.date"
));
Logger
.
appInfo
(
bundle
.
getString
(
"app.name"
),
bundle
.
getString
(
"version.name"
),
bundle
.
getString
(
"version.code"
),
bundle
.
getString
(
"version.date"
));
}
public
static
void
main
(
String
[]
args
)
{
launch
(
args
);
launch
(
args
);
}
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/de/deadlocker8/budgetmasterserver/main/Main.java
+
3
−
2
View file @
f28f1057
...
@@ -10,6 +10,7 @@ import java.util.Locale;
...
@@ -10,6 +10,7 @@ import java.util.Locale;
import
java.util.ResourceBundle
;
import
java.util.ResourceBundle
;
import
de.deadlocker8.budgetmasterserver.server.SparkServer
;
import
de.deadlocker8.budgetmasterserver.server.SparkServer
;
import
logger.FileOutputMode
;
import
logger.LogLevel
;
import
logger.LogLevel
;
import
logger.Logger
;
import
logger.Logger
;
...
@@ -23,8 +24,8 @@ public class Main
...
@@ -23,8 +24,8 @@ public class Main
Logger
.
appInfo
(
bundle
.
getString
(
"app.name"
),
bundle
.
getString
(
"version.name"
),
bundle
.
getString
(
"version.code"
),
bundle
.
getString
(
"version.date"
));
Logger
.
appInfo
(
bundle
.
getString
(
"app.name"
),
bundle
.
getString
(
"version.name"
),
bundle
.
getString
(
"version.code"
),
bundle
.
getString
(
"version.date"
));
try
try
{
{
File
logF
ile
=
new
File
(
Paths
.
get
(
SparkServer
.
class
.
getProtectionDomain
().
getCodeSource
().
getLocation
().
toURI
()).
getParent
().
toFile
()
+
"/error.log"
);
File
logF
older
=
Paths
.
get
(
SparkServer
.
class
.
getProtectionDomain
().
getCodeSource
().
getLocation
().
toURI
()).
getParent
().
toFile
()
;
Logger
.
enableFileOutput
(
logF
ile
);
Logger
.
enableFileOutput
(
logF
older
,
System
.
out
,
System
.
err
,
FileOutputMode
.
COMBINED
);
}
}
catch
(
URISyntaxException
e1
)
catch
(
URISyntaxException
e1
)
{
{
...
...
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