Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
Merge pull request #6285 from Miciah/bug-1273658-FrontendHttpServer-r…
Browse files Browse the repository at this point in the history
…ecover-from-missing-manifest

Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Oct 22, 2015
2 parents dfb0215 + 650f836 commit 43112af
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion node/lib/openshift-origin-node/model/frontend_httpd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def initialize(container)
@container_name = container.name
@namespace = container.namespace

@standalone_web_proxy = container.cartridge_model.standalone_web_proxy?
@standalone_web_proxy = (container.cartridge_model.standalone_web_proxy? rescue false)

# this is ONLY used when invoking "connect" so the app uuid can be stored
# in the nodes db, so it can be added to the node openshift_log (access log)
Expand Down

0 comments on commit 43112af

Please sign in to comment.