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

Fix journal show and journal decode command #15950

Merged
merged 1 commit into from
Jul 14, 2023
Merged

Fix journal show and journal decode command #15950

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
14 changes: 12 additions & 2 deletions graylog2-server/src/main/java/org/graylog2/commands/journal/AbstractJournalCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.graylog2.commands.journal;

import com.google.inject.AbstractModule;
import com.google.inject.Module;
import org.graylog2.Configuration;
import org.graylog2.audit.AuditBindings;
Expand All @@ -24,6 +25,8 @@
import org.graylog2.featureflag.FeatureFlags;
import org.graylog2.plugin.KafkaJournalConfiguration;
import org.graylog2.plugin.Plugin;
import org.graylog2.plugin.system.NodeId;
import org.graylog2.plugin.system.SimpleNodeId;
import org.graylog2.shared.bindings.SchedulerBindings;
import org.graylog2.shared.bindings.ServerStatusBindings;
import org.graylog2.shared.journal.LocalKafkaJournal;
Expand All @@ -50,8 +53,15 @@ public AbstractJournalCommand(String commandName) {

@Override
protected List<Module> getCommandBindings(FeatureFlags featureFlags) {
return Arrays.asList(new ConfigurationModule(configuration),
new ServerStatusBindings(capabilities()),
return Arrays.asList(
new ConfigurationModule(configuration),
new AbstractModule() {
@Override
public void configure() {
bind(NodeId.class).toInstance(new SimpleNodeId("dummy-nodeid"));
}
},
new ServerStatusBindings(capabilities()),
new SchedulerBindings(),
new LocalKafkaJournalModule(),
new AuditBindings());
Expand Down
7 changes: 7 additions & 0 deletions graylog2-server/src/main/java/org/graylog2/commands/journal/JournalDecode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.graylog2.inputs.codecs.CodecsModule;
import org.graylog2.plugin.Message;
import org.graylog2.plugin.ResolvableInetSocketAddress;
import org.graylog2.plugin.inject.Graylog2Module;
import org.graylog2.plugin.inputs.codecs.Codec;
import org.graylog2.plugin.journal.RawMessage;
import org.graylog2.shared.bindings.ObjectMapperModule;
Expand All @@ -55,6 +56,12 @@ protected List<Module> getCommandBindings(FeatureFlags featureFlags) {
.addAll(super.getCommandBindings(featureFlags))
.add(new CodecsModule())
.add(new ObjectMapperModule(getClass().getClassLoader()))
.add(new Graylog2Module() {
@Override
protected void configure() {
inputsMapBinder();
}
})
.build();
}

Expand Down
Loading