Skip to content
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

Jump to bottom

IKASAN-2414 fixing bad change log id for hash update. Also a couple o… #1323

Merged
merged 1 commit into from
Jun 11, 2024
Merged

IKASAN-2414 fixing bad change log id for hash update. Also a couple o… #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/ActionCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
*/
public abstract class ActionCommand extends AbstractCommand
{
@Value("${command.stop.process.wait.timeout.seconds:300}")
@Value("${ikasan.shell.command.stop.process.wait.timeout.seconds:300}")
int commandStopProcessWaitTimeoutSeconds = 300;

ProcessType processType = getProcessType();
Expand Down
4 changes: 2 additions & 2 deletions ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/SolrCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ JSONObject stop(ProcessType processType, String name, String username, String co
logger.error("Error occurred while waiting for process shutdown", e);
throw new RuntimeException(String.format("An error has occurred waiting for the Solr process to shutdown. " +
" This is likely to be a timout waiting for the process to end. The timeout is currently configured to " +
"[%s] seconds. This can be adjusted by setting command.stop.process.wait.timeout.seconds in the application" +
" properties.", super.commandStopProcessWaitTimeoutSeconds)
"[%s] seconds. This can be adjusted by setting `ikasan.shell.command.stop.process.wait.timeout.seconds` " +
"in the application properties.", super.commandStopProcessWaitTimeoutSeconds)
, e);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...neip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/operation/DefaultOperationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ public void stop(ProcessType processType, String name, String username, int shut
logger.error("Error occurred while waiting for process shutdown", e);
throw new RuntimeException(String.format("An error has occurred waiting for the process to shutdown. " +
" This is likely to be a timout waiting for the process to end. The timeout is currently configured to " +
"[%s] seconds. This can be adjusted by setting command.stop.process.wait.timeout.seconds in the application" +
" properties.", shutdownTimeoutSeconds)
"[%s] seconds. This can be adjusted by setting `ikasan.shell.command.stop.process.wait.timeout.seconds` " +
"in the application properties.", shutdownTimeoutSeconds)
, e);
}
}
Expand Down
3 changes: 2 additions & 1 deletion ikasaneip/cli/shell/sql/migration/liquibase-changelog-contents.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:aa12b44c16348f5122e5853952c3
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:5d5b849202096ec3d8ded4f3b5612d2f' WHERE ID = 'alterFlowInvocationMetricTimestamp';
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:4819ac97e0c7fee7682547cbde1b446d' WHERE ID = 'alterIkasanWiretapAddHarvestedTimestamp';
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:805d9fe447e260506871d732011cf698' WHERE ID = 'alterReplayEventAddHarvestedTimestamp';
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:20dfec38b41ab634480f2cb767f96f7e' WHERE ID = 'alterReplayEventAddHarvestedTimestamp';
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:20dfec38b41ab634480f2cb767f96f7e' WHERE ID = 'alterSystemEventAddHarvested';
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:b72df056bd167952c45ac0995343b1b6' WHERE ID = 'alterSystemEventAddHarvestedTimestamp';

-- File Transfer Ikasan changelog MD5SUM updates
UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:5d66a8a680dd49ed528b81ad5edec84e' WHERE ID = 'createFTChecksumCommand';
Expand Down