Skip to content

fixes: [issue 1078] handled panic in redis ping #1085

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
merged 6 commits into from
Oct 14, 2024
Merged

fixes: [issue 1078] handled panic in redis ping #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7942696
handled panic in redis ping
Oct 7, 2024
0717365
Fix assertion in container_test.go for Redis connection
Oct 9, 2024
ee7f7a7
GoCI Lint fixes
Oct 9, 2024
7d31894
testcase fixes
Oct 10, 2024
868a7aa
testcase fixes
Oct 10, 2024
7a2c0ac
Merge branch 'development' into redis-ping-panic-fix
Umang01-hash Oct 11, 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
2 changes: 1 addition & 1 deletion pkg/gofr/container/container_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func Test_newContainerDBInitializationFail(t *testing.T) {
// container is a pointer, and we need to see if db are not initialized, comparing the container object
// will not suffice the purpose of this test
require.Error(t, db.DB.Ping(), "TEST, Failed.\ninvalid db connections")
assert.Nil(t, redis.Client, "TEST, Failed.\ninvalid redis connections")
assert.NotNil(t, redis.Client, "TEST, Failed.\ninvalid redis connections")
}

func Test_newContainerPubSubInitializationFail(t *testing.T) {
Expand Down
16 changes: 7 additions & 9 deletions pkg/gofr/datasource/redis/redis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,16 @@ func NewClient(c config.Config, logger datasource.Logger, metrics Metrics) *Redi
ctx, cancel := context.WithTimeout(context.TODO(), redisPingTimeout)
defer cancel()

if err := rc.Ping(ctx).Err(); err != nil {
logger.Errorf("could not connect to redis at '%s:%d', error: %s", redisConfig.HostName, redisConfig.Port, err)

return &Redis{Client: nil, config: redisConfig, logger: logger}
}
if err := rc.Ping(ctx).Err(); err == nil {
if err = otel.InstrumentTracing(rc); err != nil {
logger.Errorf("could not add tracing instrumentation, error: %s", err)
}

if err := otel.InstrumentTracing(rc); err != nil {
logger.Errorf("could not add tracing instrumentation, error: %s", err)
logger.Logf("connected to redis at %s:%d", redisConfig.HostName, redisConfig.Port)
} else {
logger.Errorf("could not connect to redis at '%s:%d', error: %s", redisConfig.HostName, redisConfig.Port, err)
}

logger.Logf("connected to redis at %s:%d", redisConfig.HostName, redisConfig.Port)

return &Redis{Client: rc, config: redisConfig, logger: logger}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/gofr/datasource/redis/redis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func Test_NewClient_InvalidPort(t *testing.T) {
mockMetrics.EXPECT().RecordHistogram(gomock.Any(), "app_redis_stats", gomock.Any(), "hostname", gomock.Any(), "type", "ping")

client := NewClient(mockConfig, mockLogger, mockMetrics)
assert.Nil(t, client.Client, "Test_NewClient_InvalidPort Failed! Expected redis client to be nil")
assert.NotNil(t, client.Client, "Test_NewClient_InvalidPort Failed! Expected redis client not to be nil")
}

func TestRedis_QueryLogging(t *testing.T) {
Expand Down
Loading