Skip to content

Removing additional whitespace #1

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

Merged
merged 1 commit into from
Apr 24, 2024
Merged
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
30 changes: 15 additions & 15 deletions cli/.gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Generated by Cargo
# will have compiled files and executables
debug/
target/
# These are backup files generated by rustfmt
**/*.rs.bk
# Ignore OpenAPI cache files
.openapi_cache
# Ignore generated OpenAPI documentation
unit-openapi/docs
# Ignore autogenerated OpenAPI code
unit-openapi/src
# Generated by Cargo
# will have compiled files and executables
debug/
target/

# These are backup files generated by rustfmt
**/*.rs.bk

# Ignore OpenAPI cache files
.openapi_cache
# Ignore generated OpenAPI documentation
unit-openapi/docs
# Ignore autogenerated OpenAPI code
unit-openapi/src

config
20 changes: 10 additions & 10 deletions cli/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# NGINX UNIT Rust SDK and CLI

This project provides a Rust SDK interface to the
This project provides a Rust SDK interface to the
[NGINX UNIT](https://unit.nginx.org/)
[control API](https://unit.nginx.org/howto/source/#source-startup)
[control API](https://unit.nginx.org/howto/source/#source-startup)
and a CLI (`unitctl`) that exposes the functionality provided by the SDK.

## Installation and Use
In order to build and use `unitctl` one needs a working installation of Maven
and Cargo. It is recommended to procure Cargo with Rustup. Rustup is packaged
for use in many systems, but you can also find it at its
In order to build and use `unitctl` one needs a working installation of Maven
and Cargo. It is recommended to procure Cargo with Rustup. Rustup is packaged
for use in many systems, but you can also find it at its
[Official Site](https://rustup.rs/).

With a working installation of Cargo it is advised to build unitctl with the
provided makefile. The `list-targets` target will inform the user of what
With a working installation of Cargo it is advised to build unitctl with the
provided makefile. The `list-targets` target will inform the user of what
platforms are available to be built. One or more of these can then be run as
their own makefile targets. Alternatively, all available binary targets can be
built with `make all`. See the below example for illustration:
Expand All @@ -30,7 +30,7 @@ with debug_info, not stripped
```

As demonstrated in the example above, compiled binaries may be found in the
targets folder, under the subdirectory corresponding to the build target
targets folder, under the subdirectory corresponding to the build target
desired.


Expand Down Expand Up @@ -106,7 +106,7 @@ $ unitctl edit

{
"success": "Reconfiguration done."
}
}
```

### Display interactive OpenAPI control panel
Expand Down Expand Up @@ -137,7 +137,7 @@ Timeout waiting for unit to start has been exceeded

We welcome pull requests and issues!

Please refer to the
Please refer to the
[Contributing Guidelines](../CONTRIBUTING.md) when doing a PR.

## License
Expand Down
3 changes: 1 addition & 2 deletions cli/build/openapi-generator-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,4 @@ java -ea \
-Xms512M \
-Xmx1024M \
-server \
-jar ${DIR}/${jar} "$@"

-jar ${DIR}/${jar} "$@"
2 changes: 1 addition & 1 deletion cli/man/unitctl.1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Report any issues on the project issue tracker at:
\fB<https://github.com/nginx/unit>\fR
.
.SH ACKNOWLEDGEMENTS
WRITE ME
WRITE ME
.
.SH AUTHOR
Elijah Zupancic \fB<[email protected]>\fR
Expand Down
3 changes: 1 addition & 2 deletions cli/unit-openapi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,5 +408,4 @@ cargo doc --open

## Author

[email protected]

[email protected]
2 changes: 1 addition & 1 deletion cli/unitctl/src/unitctl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ pub(crate) enum Commands {
help = "Output format: yaml, json, json-pretty (default)"
)]
output_format: OutputFormat,
}
},
}

fn parse_control_socket_address(s: &str) -> Result<ControlSocket, ClapError> {
Expand Down