Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Feature/simple logging #121

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.

Sign up for GitHub

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
Pazus merged 14 commits into from
Feb 14, 2019
Merged

Feature/simple logging #121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0aa366c
Add simple and basic logging
pesse Feb 5, 2019
606aacb
Add some useful information to output
pesse Feb 6, 2019
9e572bd
StringBlock Formatter for nicer log output
pesse Feb 7, 2019
9014771
AppendLine-function
pesse Feb 7, 2019
078b727
Add useful information in RunCommand
pesse Feb 7, 2019
8bdaf0f
Add quiet and debug flags and also a simple debug configuration
pesse Feb 7, 2019
6a7d650
Refactoring
pesse Feb 7, 2019
801484f
Update documentation
pesse Feb 7, 2019
36ac26e
Reporters- and VersionInfo-Command should not log atm
pesse Feb 7, 2019
00c712a
Update src/main/java/org/utplsql/cli/LoggerConfiguration.java
Pazus Feb 11, 2019
053dfc9
Refactoring according to Pazus suggestions
pesse Feb 12, 2019
351c76a
Some more information around used connector and NLS
pesse Feb 14, 2019
0733e11
Separate username/PW from connectstring so it's properly masked in lo…
pesse Feb 14, 2019
2578f8a
Reporters Command should abort when no connection is possible
pesse Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Some more information around used connector and NLS
  • Loading branch information
@pesse
pesse committed Feb 14, 2019
commit 351c76a15e20d440be83adb8e9075dd6e585400c
1 change: 1 addition & 0 deletions src/main/java/org/utplsql/cli/RunCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ private void outputMainInformation() {
formatter.appendLine(JavaApiVersionInfo.getInfo());
formatter.appendLine("Java-Version: " + System.getProperty("java.version"));
formatter.appendLine("ORACLE_HOME: " + EnvironmentVariableUtil.getEnvValue("ORACLE_HOME"));
formatter.appendLine("NLS_LANG: " + EnvironmentVariableUtil.getEnvValue("NLS_LANG"));
formatter.appendLine("");
formatter.appendLine("Thanks for testing!");

Expand Down
5 changes: 5 additions & 0 deletions src/main/java/org/utplsql/cli/datasource/TestedDataSourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.utplsql.cli.datasource;

import com.zaxxer.hikari.HikariDataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.utplsql.api.EnvironmentVariableUtil;
import org.utplsql.cli.ConnectionConfig;
import org.utplsql.cli.exception.DatabaseConnectionFailed;
Expand All @@ -19,6 +21,7 @@ interface ConnectStringPossibility {
String getMaskedConnectString(ConnectionConfig config);
}

private static final Logger logger = LoggerFactory.getLogger(TestedDataSourceProvider.class);
private final ConnectionConfig config;
private List<ConnectStringPossibility> possibilities = new ArrayList<>();

Expand Down Expand Up @@ -46,6 +49,7 @@ private void setThickOrThinJdbcUrl(HikariDataSource ds ) throws SQLException
for (ConnectStringPossibility possibility : possibilities) {
ds.setJdbcUrl(possibility.getConnectString(config));
try (Connection con = ds.getConnection()) {
logger.info("Use connectstring {}", possibility.getMaskedConnectString(config));
return;
} catch (UnsatisfiedLinkError | Exception e) {
errors.add(possibility.getMaskedConnectString(config) + ": " + e.getMessage());
Expand Down Expand Up @@ -78,6 +82,7 @@ private void setInitSqlFrom_NLS_LANG(HikariDataSource ds ) {
sb.append(String.format("EXECUTE IMMEDIATE q'[%s]';\n", command));
sb.append("END;");

logger.debug("NLS settings: {}", sb.toString());
ds.setConnectionInitSql(sb.toString());
}
}
Expand Down