Skip to content

Small fix to reindex command and osmt_cli.sh #328

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
JohnKallies merged 2 commits into from
Mar 14, 2023
Merged

Small fix to reindex command and osmt_cli.sh #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de8bb0a
Small fix to reindex command and osmt_cli.sh
JohnKallies Mar 9, 2023
4e94ea3
Address PR feedback
JohnKallies Mar 10, 2023
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
1 change: 0 additions & 1 deletion api/src/main/kotlin/edu/wgu/osmt/elasticsearch/ReindexCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class ReindexCommand: CommandLineRunner {
private lateinit var applicationContext: ApplicationContext

override fun run(vararg args: String?) {
elasticSearchReindexer.deleteAllIndices()
elasticSearchReindexer.reindexAll()
(applicationContext as ConfigurableApplicationContext).close()
}
Expand Down
9 changes: 7 additions & 2 deletions osmt_cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,14 @@ load_static_ci_dataset(){
echo
_validate_mysql_client || return 1

local -i db_container_count; db_container_count="$(docker ps -q --filter name=${OSMT_STACK_NAME}_db_1 | wc -l)"
local -i db_container_count=0;
# some installations of Docker delimit container names with hyphens. Others use underscores.
db_container_count+="$(docker ps -q --filter name=${OSMT_STACK_NAME}_db_1 | wc -l)"
db_container_count+="$(docker ps -q --filter name=${OSMT_STACK_NAME}-db-1 | wc -l)"
echo_debug $db_container_count
if [[ "${db_container_count}" -ne 1 ]]; then
Comment thread
Corpratespaz marked this conversation as resolved.
echo_err "Development Docker stack MySQL container is not running. Exiting..."
echo_err "Development Docker stack MySQL container is not running as expected."
echo_err "(${db_container_count} ${OSMT_STACK_NAME} DB containers running. Should be 1). Exiting..."
return 1
fi

Expand Down