Skip to content

Commit

Permalink
[#18580] yugabyted: Code-fix for a bug due to merge conflict.
Browse files Browse the repository at this point in the history
Summary:
A code error occurred due to merge conflict happened in the [[ cade0a8 | commit ]] while rebasing with master which had this [[ db590b4 | commit ]]
Fixing the bug.
Jira: DB-7514

Test Plan: Manual Testing

Reviewers: nikhil

Reviewed By: nikhil

Subscribers: yugabyted-dev, sgarg-yb

Differential Revision: https://phorge.dev.yugabyte.com/D30342
  • Loading branch information
gargsans-yb committed Nov 22, 2023
1 parent 44fedba commit a6e9e50
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions bin/yugabyted
Original file line number Diff line number Diff line change
Expand Up @@ -1832,15 +1832,11 @@ class ControlScript(object):
yugabyted_ui_cmd.extend(["-secure=true",
"-database_password={}".format(
self.configs.saved_data.get("database_password"))])
if self.configs.saved_data.get("secure"):
yugabyted_ui_cmd.extend(["-secure=true",
"-database_password={}".format(
self.configs.saved_data.get("database_password"))])

self.processes["yugabyted-ui"] = ProcessManager(
"yugabyted-ui", yugabyted_ui_cmd,
self.configs.saved_data.get("log_dir"),
self.configs.saved_data.get("data_dir"))

self.processes["yugabyted-ui"] = ProcessManager(
"yugabyted-ui", yugabyted_ui_cmd,
self.configs.saved_data.get("log_dir"),
self.configs.saved_data.get("data_dir"))

if self.configs.saved_data.get("ui") and ui_port_available:
(_, was_started) = self.verify_start_yugabyted_ui(is_first_run, is_first_install)
Expand Down

0 comments on commit a6e9e50

Please sign in to comment.