Skip to content

fix: remove circular dep in admin svc, adjusts default superuser env flag name and default #572

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
lhotari merged 2 commits into from
May 11, 2024
Merged

fix: remove circular dep in admin svc, adjusts default superuser env flag name and default #572

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
467ddff
fix: adjust env var name, default in application.properties vs code a…
maranmaran May 10, 2024
d6dc1f0
fix: remove circular ref
maranmaran May 10, 2024
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
8 changes: 4 additions & 4 deletions src/main/java/org/apache/pulsar/manager/PulsarApplicationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public class PulsarApplicationListener implements ApplicationListener<ContextRef
@Value("${default.environment.bookie_url}")
private String defaultEnvironmentBookieUrl;

@Value("${default.superuser.enable}")
private Boolean defaultSuperuserEnable = false;
@Value("${default.superuser.enabled}")
private Boolean defaultSuperuserEnabled;

@Value("${default.superuser.name}")
private String defaultSuperuserName;
Expand Down Expand Up @@ -94,8 +94,8 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
}

private void seedDefaultSuperuser() {
if(defaultSuperuserEnable == false) {
log.debug("Superuser seed disabled");
if(defaultSuperuserEnabled == false) {
log.info("Superuser seed via application.properties is disabled");
return;
}

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/org/apache/pulsar/manager/service/impl/PulsarAdminServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ public class PulsarAdminServiceImpl implements PulsarAdminService {
@Autowired
private EnvironmentsRepository environmentsRepository;

@Autowired
private EnvironmentCacheService environmentCacheService;

@PreDestroy
public void destroy() {
pulsarAdmins.values().forEach(value -> value.close());
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ default.environment.service_url=
default.environment.bookie_url=

# default superuser configuration
default.superuser.enable=
default.superuser.enabled=false
default.superuser.name=
default.superuser.password=
default.superuser.email=
Expand Down