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

Add missing index for "session_id" in "sessions" collection #4070

Merged
merged 1 commit into from Aug 11, 2017
Merged

Add missing index for "session_id" in "sessions" collection #4070

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion graylog2-server/src/main/java/org/graylog2/security/MongoDBSessionServiceImpl.java
View file
Open in desktop
Expand Up @@ -19,26 +19,36 @@
import com.google.common.collect.Lists;
import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.Indexes;
import org.bson.Document;
import org.bson.types.ObjectId;
import org.graylog2.database.MongoConnection;
import org.graylog2.database.PersistedServiceImpl;

import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Collection;
import java.util.List;

@Singleton
public class MongoDBSessionServiceImpl extends PersistedServiceImpl implements MongoDBSessionService {
@Inject
public MongoDBSessionServiceImpl(MongoConnection mongoConnection) {
super(mongoConnection);

final MongoDatabase database = mongoConnection.getMongoDatabase();
final MongoCollection<Document> sessions = database.getCollection(MongoDbSession.COLLECTION_NAME);
sessions.createIndex(Indexes.ascending(MongoDbSession.FIELD_SESSION_ID));
}

@Override
@Nullable
public MongoDbSession load(String sessionId) {
DBObject query = new BasicDBObject();
query.put("session_id", sessionId);
query.put(MongoDbSession.FIELD_SESSION_ID, sessionId);

DBObject result = findOne(MongoDbSession.class, query);
if (result == null) {
Expand Down
6 changes: 4 additions & 2 deletions graylog2-server/src/main/java/org/graylog2/security/MongoDbSession.java
View file
Open in desktop
Expand Up @@ -35,9 +35,11 @@
import java.util.Map;
import java.util.Optional;

@CollectionName("sessions")
@CollectionName(MongoDbSession.COLLECTION_NAME)
public class MongoDbSession extends PersistedImpl {
private static final Logger LOG = LoggerFactory.getLogger(MongoDbSession.class);
static final String COLLECTION_NAME = "sessions";
static final String FIELD_SESSION_ID = "session_id";

protected MongoDbSession(Map<String, Object> fields) {
super(fields);
Expand Down Expand Up @@ -144,6 +146,6 @@ public void setExpired(boolean expired) {
}

public String getSessionId() {
return String.valueOf(fields.get("session_id"));
return String.valueOf(fields.get(FIELD_SESSION_ID));
}
}