Skip to content
This repository was archived by the owner on Feb 25, 2021. It is now read-only.

Feature/use config #7

Merged
merged 4 commits into from
Mar 17, 2019
Merged

Feature/use config #7

merged 4 commits into from
Mar 17, 2019

Conversation

parkervcp
Copy link
Member

This to get the sftp-server to use the port configured in the daemon config if a port was not set via flag.

@parkervcp
Copy link
Member Author

This can be expanded for other settings but the only pertinent one was the port at the moment.

Copy link
Member

@DaneEveritt DaneEveritt left a comment

Choose a reason for hiding this comment

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

See comment

main.go Outdated
logger.Get().Infow("using config daemon port", zap.String("port", strconv.Itoa(int(confPort))))
bindPort = int(confPort)
// default to the bindPort default from the flag section
logger.Get().Debugw("could not find sftp port, falling back to \"2022\"", zap.Error(err))111
Copy link
Member

Choose a reason for hiding this comment

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

Whats the 111 at the end for?

Copy link
Member

@DaneEveritt DaneEveritt left a comment

Choose a reason for hiding this comment

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

Looks like some trailing code got left

@parkervcp
Copy link
Member Author

@DaneEveritt I got fat hands man... Plus the 1 key is next to the arrows on my laptop for some reason...

@DaneEveritt DaneEveritt merged commit a463aaf into pterodactyl:master Mar 17, 2019
@parkervcp parkervcp deleted the feature/use-config branch March 18, 2019 12:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants