Skip to content

Commit

Permalink
Merge pull request #16 from kpumuk/grammar
Browse files Browse the repository at this point in the history
Fixed several typos in comments and documentation
  • Loading branch information
kevinmcconnell authored Sep 23, 2024
2 parents 726d173 + 29194ad commit 27be629
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Kamal Proxy is a tiny HTTP proxy, designed to make it easy to coordinate
zero-downtime deployments. By running your web applications behind Kamal Proxy,
you can deploy changes to them without interruping any of the traffic that's in
you can deploy changes to them without interrupting any of the traffic that's in
progress. No particular cooperation from an application is required for this to
work.

Expand Down Expand Up @@ -78,7 +78,7 @@ Only one service at a time can route a specific host:
kamal-proxy deploy service1 --target web-1:3000 --host app1.example.com
kamal-proxy deploy service2 --target web-2:3000 --host app1.example.com # returns "Error: host is used by another service"
kamal-proxy remove service1
kamal-proxy deploy service2 --target web-2:3000 --host app1.example.com # suceeds
kamal-proxy deploy service2 --target web-2:3000 --host app1.example.com # succeeds


### Automatic TLS
Expand Down
2 changes: 1 addition & 1 deletion example/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Deployment example

You can start up a example environment using Docker Compose in this directory.
You can start up an example environment using Docker Compose in this directory.

First, start the services:

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func newDeployCommand() *deployCommand {
deployCommand.cmd.Flags().StringVar(&deployCommand.args.Host, "host", "", "Host to serve this target on (empty for wildcard)")

deployCommand.cmd.Flags().BoolVar(&deployCommand.tls, "tls", false, "Configure TLS for this target (requires a non-empty host)")
deployCommand.cmd.Flags().BoolVar(&deployCommand.tlsStaging, "tls-staging", false, "Use Let's Encrypt staging environmnent for certificate provisioning")
deployCommand.cmd.Flags().BoolVar(&deployCommand.tlsStaging, "tls-staging", false, "Use Let's Encrypt staging environment for certificate provisioning")

deployCommand.cmd.Flags().DurationVar(&deployCommand.args.DeployTimeout, "deploy-timeout", server.DefaultDeployTimeout, "Maximum time to wait for the new target to become healthy")
deployCommand.cmd.Flags().DurationVar(&deployCommand.args.DrainTimeout, "drain-timeout", server.DefaultDrainTimeout, "Maximum time to allow existing connections to drain before removing old target")
Expand Down
2 changes: 1 addition & 1 deletion internal/server/error_page_middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (h *ErrorPageMiddleware) getTemplate(statusCode int) *template.Template {

func (h *ErrorPageMiddleware) writeErrorWithoutTemplate(w http.ResponseWriter, statusCode int) bool {
if h.root {
// Only do this when we're the root middleware. Otherwise we can let our parent try to handle it.
// Only do this when we're the root middleware. Otherwise, we can let our parent try to handle it.
fmt.Fprintf(w, "<h1>%d %s</h1>", statusCode, http.StatusText(statusCode))
return true
}
Expand Down
2 changes: 1 addition & 1 deletion internal/server/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ func (s *Service) serviceRequestWithTarget(w http.ResponseWriter, r *http.Reques
func (s *Service) handlePausedAndStoppedRequests(w http.ResponseWriter, r *http.Request) bool {
if s.pauseController.GetState() != PauseStateRunning && s.ActiveTarget().IsHealthCheckRequest(r) {
// When paused or stopped, return success for any health check
// requests from downstream services. Otherwise they might consider
// requests from downstream services. Otherwise, they might consider
// us as unhealthy while in that state, and remove us from their
// pool.
w.WriteHeader(http.StatusOK)
Expand Down

0 comments on commit 27be629

Please sign in to comment.