update broker name
diff --git a/images/broker/brokerGenConfig.sh b/images/broker/brokerGenConfig.sh
index 02795a2..fd9bf71 100755
--- a/images/broker/brokerGenConfig.sh
+++ b/images/broker/brokerGenConfig.sh
@@ -28,7 +28,8 @@
fi
fi
-BROKER_NAME=$(cat /etc/hostname | grep -o '[^-]*$')
+#BROKER_NAME=$(cat /etc/hostname | grep -o '[^-]*$')
+BROKER_NAME=$(cat /etc/hostname)
DELETE_WHEN="04"
FILE_RESERVED_TIME="48"
FLUSH_DISK_TYPE="ASYNC_FLUSH"
@@ -38,7 +39,7 @@
echo "Creating broker configuration."
echo "#This file was auto generated by rocketmq-operator. DO NOT EDIT." >> $BROKER_CONFIG_FILE
echo "brokerClusterName=$BROKER_CLUSTER_NAME" >> $BROKER_CONFIG_FILE
- echo "brokerName=broker-$BROKER_NAME" >> $BROKER_CONFIG_FILE
+ echo "brokerName=$BROKER_NAME" >> $BROKER_CONFIG_FILE
echo "brokerId=$BROKER_ID" >> $BROKER_CONFIG_FILE
echo "deleteWhen=$DELETE_WHEN" >> $BROKER_CONFIG_FILE
echo "fileReservedTime=$FILE_RESERVED_TIME" >> $BROKER_CONFIG_FILE
diff --git a/pkg/controller/metaservice/metaservice_controller.go b/pkg/controller/metaservice/metaservice_controller.go
index 4421df8..7fabe66 100644
--- a/pkg/controller/metaservice/metaservice_controller.go
+++ b/pkg/controller/metaservice/metaservice_controller.go
@@ -219,7 +219,7 @@
reqLogger.Error(err, "Update Broker config " + key + " failed of cluster " + clusterName)
return reconcile.Result{Requeue: true}, err
}
- reqLogger.Info("Successfully updated Broker config " + key + " of cluster " + clusterName + " with output:\n" + string(output))
+ reqLogger.Info("Successfully updated Broker config " + key + " of cluster " + clusterName + " with output: " + string(output))
}
}
