Skip to content

Commit 9ab2dc2

Browse files
author
Nikolas De Giorgis
authored
CLOUDP-92631: mongodb log to stdout (#584)
1 parent 5dc63f9 commit 9ab2dc2

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

docs/RELEASE_NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- Changes
66
- stability improvements when changing version of MongoDB.
77
- increased number of concurrent resources the operator can act on.
8+
- mongodb will now send its log to stdout by default.
89

910
## Updated Image Tags
1011

pkg/automationconfig/automation_config_builder.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package automationconfig
22

33
import (
44
"fmt"
5-
"path"
65
"reflect"
76
"strings"
87

@@ -214,11 +213,6 @@ func (b *Builder) Build() (AutomationConfig, error) {
214213
Version: b.mongodbVersion,
215214
AuthSchemaVersion: 5,
216215
}
217-
process.SetSystemLog(SystemLog{
218-
Destination: "file",
219-
Path: path.Join(DefaultAgentLogPath, "/mongodb.log"),
220-
LogAppend: true,
221-
})
222216

223217
if b.fcv != "" {
224218
process.FeatureCompatibilityVersion = b.fcv

pkg/automationconfig/automation_config_secret_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestEnsureSecret(t *testing.T) {
2525
SetNamespace(secretNsName.Namespace).
2626
Build()
2727

28-
secretGetUpdateCreator := mockSecretGetUpdateCreator{secret: &s}
28+
secretGetUpdateCreator := &mockSecretGetUpdateCreator{secret: &s}
2929

3030
ac, err := EnsureSecret(secretGetUpdateCreator, secretNsName, []metav1.OwnerReference{}, desiredAutomationConfig)
3131
assert.NoError(t, err)
@@ -45,7 +45,7 @@ func TestEnsureSecret(t *testing.T) {
4545
existingSecret, err := newAutomationConfigSecret(oldAc, secretNsName)
4646
assert.NoError(t, err)
4747

48-
secretGetUpdateCreator := mockSecretGetUpdateCreator{secret: &existingSecret}
48+
secretGetUpdateCreator := &mockSecretGetUpdateCreator{secret: &existingSecret}
4949

5050
newAc, err := newAutomationConfigBuilder().SetDomain("different-domain").Build()
5151
assert.NoError(t, err)
@@ -83,7 +83,7 @@ type mockSecretGetUpdateCreator struct {
8383
secret *corev1.Secret
8484
}
8585

86-
func (m mockSecretGetUpdateCreator) GetSecret(objectKey client.ObjectKey) (corev1.Secret, error) {
86+
func (m *mockSecretGetUpdateCreator) GetSecret(objectKey client.ObjectKey) (corev1.Secret, error) {
8787
if m.secret != nil {
8888
if objectKey.Name == m.secret.Name && objectKey.Namespace == m.secret.Namespace {
8989
return *m.secret, nil
@@ -92,13 +92,13 @@ func (m mockSecretGetUpdateCreator) GetSecret(objectKey client.ObjectKey) (corev
9292
return corev1.Secret{}, notFoundError()
9393
}
9494

95-
func (m mockSecretGetUpdateCreator) UpdateSecret(secret corev1.Secret) error {
95+
func (m *mockSecretGetUpdateCreator) UpdateSecret(secret corev1.Secret) error {
9696
m.secret = &secret
9797
return nil
9898
}
9999

100-
func (m mockSecretGetUpdateCreator) CreateSecret(secret corev1.Secret) error {
101-
if m.secret != nil {
100+
func (m *mockSecretGetUpdateCreator) CreateSecret(secret corev1.Secret) error {
101+
if m.secret == nil {
102102
m.secret = &secret
103103
return nil
104104
}

0 commit comments

Comments
 (0)