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

add option for max connection #112

Merged
merged 4 commits into from
Aug 13, 2016
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 3 additions & 0 deletions .gotty
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
// To enable reconnection, set `true` to `enable_reconnect`
// reconnect_time = false

// [int] Maximum connection to gotty, 0(default) means no limit.
// max_connection = 0

// [bool] Accept only one client and exit gotty once the client exits
// once = false

Expand Down
15 changes: 15 additions & 0 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ import (
"github.com/yudai/umutex"
)

var (
connection int = 0
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable should be a member of the App struct.

)

type InitMessage struct {
Arguments string `json:"Arguments,omitempty"`
AuthToken string `json:"AuthToken,omitempty"`
Expand Down Expand Up @@ -62,6 +66,7 @@ type Options struct {
TitleFormat string `hcl:"title_format"`
EnableReconnect bool `hcl:"enable_reconnect"`
ReconnectTime int `hcl:"reconnect_time"`
MaxConnection int `hcl:"max_connection"`
Once bool `hcl:"once"`
PermitArguments bool `hcl:"permit_arguments"`
CloseSignal int `hcl:"close_signal"`
Expand All @@ -88,6 +93,7 @@ var DefaultOptions = Options{
TitleFormat: "GoTTY - {{ .Command }} ({{ .Hostname }})",
EnableReconnect: false,
ReconnectTime: 10,
MaxConnection: 0,
Once: false,
CloseSignal: 1, // syscall.SIGHUP
Preferences: HtermPrefernces{},
Expand Down Expand Up @@ -274,6 +280,12 @@ func (app *App) makeServer(addr string, handler *http.Handler) (*http.Server, er
}

func (app *App) handleWS(w http.ResponseWriter, r *http.Request) {
if app.options.MaxConnection != 0 {
if connection >= app.options.MaxConnection {
log.Printf("reached max connection: %d", app.options.MaxConnection)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log messages should start with a capital letter

return
}
}
log.Printf("New client connected: %s", r.RemoteAddr)

if r.Method != "GET" {
Expand Down Expand Up @@ -344,6 +356,9 @@ func (app *App) handleWS(w http.ResponseWriter, r *http.Request) {
}
log.Printf("Command is running for client %s with PID %d (args=%q)", r.RemoteAddr, cmd.Process.Pid, strings.Join(argv, " "))

connection++
log.Printf("Connection: %d/%d\n", connection, app.options.MaxConnection)
Copy link
Owner

@yudai yudai Aug 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should show when MaxConnection is not 0. And it's better to merge to the log line above ("Command is running....")


context := &clientContext{
app: app,
request: r,
Expand Down
2 changes: 2 additions & 0 deletions app/client_context.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ func (context *clientContext) goHandleClient() {

context.command.Wait()
context.connection.Close()
connection--
log.Printf("Connection closed: %s", context.request.RemoteAddr)
log.Printf("Connection: %d/%d\n", connection, context.app.options.MaxConnection)
}()
}

Expand Down
1 change: 1 addition & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func main() {
flag{"title-format", "", "Title format of browser window"},
flag{"reconnect", "", "Enable reconnection"},
flag{"reconnect-time", "", "Time to reconnect"},
flag{"max-connection", "", "Maximum connection to gotty, 0(default) means no limit"},
flag{"once", "", "Accept only one client and exit on disconnection"},
flag{"permit-arguments", "", "Permit clients to send command line arguments in URL (e.g. http://example.com:8080/?arg=AAA&arg=BBB)"},
flag{"close-signal", "", "Signal sent to the command process when gotty close it (default: SIGHUP)"},
Expand Down