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.

Sign up for GitHub

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

Jump to bottom

Add multiple hostname support #101

Merged
merged 2 commits into from Jul 25, 2017
Merged

Add multiple hostname support #101

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a1042d
Add multiple hostname support
javan Feb 5, 2017
e12d8b7
Store canonical and alias name references to shared app instance
javan Feb 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 37 additions & 10 deletions dev/app.go
View file
Open in desktop
Expand Up @@ -451,14 +451,15 @@ func (a *AppPool) App(name string) (*App, error) {
a.Events.Add("app_lookup", "path", path)

stat, err := os.Stat(path)
destPath, _ := os.Readlink(path)

if err != nil {
if os.IsNotExist(err) {
// Check there might be a link there but it's not valid
_, err := os.Lstat(path)
if err == nil {
dest, _ := os.Readlink(path)
fmt.Printf("! Bad symlink detected '%s'. Destination '%s' doesn't exist\n", path, dest)
a.Events.Add("bad_symlink", "path", path, "dest", dest)
fmt.Printf("! Bad symlink detected '%s'. Destination '%s' doesn't exist\n", path, destPath)
a.Events.Add("bad_symlink", "path", path, "dest", destPath)
}

return nil, ErrUnknownApp
Expand All @@ -467,18 +468,39 @@ func (a *AppPool) App(name string) (*App, error) {
return nil, err
}

if stat.IsDir() {
app, err = a.LaunchApp(name, path)
} else {
app, err = a.readProxy(name, path)
canonicalName := name
aliasName := ""

// Handle multiple symlinks to the same app
destStat, err := os.Stat(destPath)
if err == nil {
destName := destStat.Name()
if destName != canonicalName {
canonicalName = destName
aliasName = name
}
}

app, ok = a.apps[canonicalName]

if !ok {
if stat.IsDir() {
app, err = a.LaunchApp(canonicalName, path)
} else {
app, err = a.readProxy(canonicalName, path)
}
}

if err != nil {
a.Events.Add("error_starting_app", "app", name, "error", err.Error())
a.Events.Add("error_starting_app", "app", canonicalName, "error", err.Error())
return nil, err
}

a.apps[name] = app
a.apps[canonicalName] = app

if aliasName != "" {
a.apps[aliasName] = app
}

return app, nil
}
Expand All @@ -487,7 +509,12 @@ func (a *AppPool) remove(app *App) {
a.lock.Lock()
defer a.lock.Unlock()

delete(a.apps, app.Name)
// Find all instance references so aliases are removed too
for name, candidate := range a.apps {
if candidate == app {
delete(a.apps, name)
}
}

if a.AppClosed != nil {
a.AppClosed(app)
Expand Down