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.

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

Documentation review #4

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
161 changes: 72 additions & 89 deletions README.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions client/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func defaultConfig() *Cfg {
hooks: &hooks{},
HeartbeatInterval: 5 * time.Second,
MaxConcurrency: 10,
TargetServer: "127.0.0.1:8080",
}
return cfg
}
Expand Down
2 changes: 1 addition & 1 deletion client_side_broadcast_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestUserCanConfigureBroadcastHandler(t *testing.T) {
arbiter.ErrorHappened(err)
return
}
_, err = s.BroadCast(context.TODO(), message.New().SetPayload(oMsg))
_, err = s.Broadcast(context.TODO(), message.New().SetPayload(oMsg))
if err != nil {
arbiter.ErrorHappened(err)
return
Expand Down
2 changes: 1 addition & 1 deletion docs/.$idea.drawio.svg.bkp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/.$idea.drawio.svg.dtmp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/idea.drawio.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion internal/lab/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func interactions(ctx context.Context, s *server.MeteredServer) {
case <-ctx.Done():
return
default:
_, err := s.BroadCast(context.Background(), message.New().SetPayload(&protos.BroadcastV1{
_, err := s.Broadcast(context.Background(), message.New().SetPayload(&protos.BroadcastV1{
Message: "Broadcasting !",
Data: bytes,
}))
Expand Down
2 changes: 1 addition & 1 deletion lifecycle_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ func TestClientHandlerCannotSendIfClosed(t *testing.T) {

// We provoke the handler execution of the client
// with a broadcast message.
_, err := s.BroadCast(defaultCtx, defaultMsg)
_, err := s.Broadcast(defaultCtx, defaultMsg)
require.NoError(t, err)

// We close the client, now the internal status changed.
Expand Down
4 changes: 2 additions & 2 deletions lifecycle_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ func TestServerCannotSendMessagesIfNotRunning(t *testing.T) {

s, run := PrepareServer(t)

_, err := s.BroadCast(defaultCtx, defaultMsg)
_, err := s.Broadcast(defaultCtx, defaultMsg)
assert.ErrorIs(t, err, server.ErrNotRunning, "should not broadcast messages if not connected")

run()

err = s.Shutdown(defaultCtx)
require.NoError(t, err)

_, err = s.BroadCast(defaultCtx, defaultMsg)
_, err = s.Broadcast(defaultCtx, defaultMsg)
assert.ErrorIs(t, err, server.ErrNotRunning, "should not broadcast messages on closed status")
}

Expand Down
2 changes: 1 addition & 1 deletion multi_comm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestServerCanBroadCastMessages(t *testing.T) {
arbiter.ItsAFactThat("CLIENT2_RECEIVED_SERVER_GREET")
}))
connect2()
brResult, err := s.BroadCast(defaultCtx, defaultMsg)
brResult, err := s.Broadcast(defaultCtx, defaultMsg)
require.NoError(t, err)
require.Len(t, brResult, 2)
require.Equal(t, 12, brResult[0].Size)
Expand Down
2 changes: 1 addition & 1 deletion pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func WorkerPoolTest(maxConcurrency int, shouldBeActive bool) func(t *testing.T)

_, err := c.Send(defaultMsg)
require.NoError(t, err)
_, err = s.BroadCast(defaultCtx, defaultMsg)
_, err = s.Broadcast(defaultCtx, defaultMsg)
require.NoError(t, err)
if shouldBeActive {
arbiter.RequireHappenedInOrder(
Expand Down
4 changes: 2 additions & 2 deletions racy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ func TestNoRaces(t *testing.T) {
// Stress all parts of the system through the public API. All uses cases at the same time.
const maxConcurrent = 20
go exec.Parallelize(ctx, wg, maxConcurrent, func() {
if _, err := s.BroadCast(defaultCtx, defaultMsg); err != nil && err != server.ErrNotRunning {
if _, err := s.Broadcast(defaultCtx, defaultMsg); err != nil && err != server.ErrNotRunning {
arbiter.ErrorHappened(err)
return
}
arbiter.ItsAFactThat("s.BroadCast()")
arbiter.ItsAFactThat("s.Broadcast()")
})

go exec.Parallelize(ctx, wg, maxConcurrent, func() {
Expand Down
1 change: 1 addition & 0 deletions server/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ type Cfg struct {
func defaultConfig() *Cfg {
cfg := &Cfg{
hooks: &hooks{},
ListenURL: "127.0.0.1:8080",
MaxConcurrency: 10,
}
return cfg
Expand Down
4 changes: 2 additions & 2 deletions server/metered.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ func (s *MeteredServer) Handle(msg proto.Message, handler message.Handler) {
s.s.Handle(msg, handler)
}

func (s *MeteredServer) BroadCast(ctx context.Context, msg *message.Message) (brResult []BroadcastResult, err error) {
func (s *MeteredServer) Broadcast(ctx context.Context, msg *message.Message) (brResult []BroadcastResult, err error) {
start := time.Now()
brResult, err = s.s.BroadCast(ctx, msg)
brResult, err = s.s.Broadcast(ctx, msg)
if err != nil {
s.metrics.Errors.Inc()
return
Expand Down
4 changes: 2 additions & 2 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ type BroadcastResult struct {
Duration time.Duration
}

// BroadCast will try to send the provided message to all
// Broadcast will try to send the provided message to all
// connected clients.
//
// In case the provided context is canceled, the operation
Expand All @@ -123,7 +123,7 @@ type BroadcastResult struct {
// feedback, such as time distribution.
//
// Calling this method it's intended to be thread safe.
func (s *Server) BroadCast(ctx context.Context, msg *message.Message) (brResult []BroadcastResult, err error) {
func (s *Server) Broadcast(ctx context.Context, msg *message.Message) (brResult []BroadcastResult, err error) {
if s.status() != ws.StatusRunning {
return []BroadcastResult{}, ErrNotRunning
}
Expand Down