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

Only use second line of server.pid for port info #188

Merged
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
8 changes: 4 additions & 4 deletions src/gui-source/Kolibri/Kolibri.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ char * getKolibriLinkAddress() {
std::ifstream file(pidFile);
if (file.is_open()) {
std::string line;
while (getline(file, line)) {
if (isServerOnline("Kolibri session", joinChr("http://127.0.0.1:", line.c_str()))) {
httpLink = joinChr("http://127.0.0.1:", line.c_str());
}
getline(file, line); // get the first line, do nothing
Copy link
Member

Choose a reason for hiding this comment

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

This is exactly the right kind of clever.

getline(file, line); // the second line should have the the port information
Copy link
Member

Choose a reason for hiding this comment

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

So is this!

if (isServerOnline("Kolibri session", joinChr("http://127.0.0.1:", line.c_str()))) {
httpLink = joinChr("http://127.0.0.1:", line.c_str());
}
file.close();
return httpLink;
Expand Down