2.7.1 unexpected return

.travis.yml

@@ -13,7 +13,7 @@ gemfile:
 
 # Set the default scripts that are used for the majority of the tests in the matrix
 before_install:
-  - ./ci/travis/setup.sh
+  - travis_wait ./ci/travis/setup.sh
 before_script:
   - sudo Xvfb :99 -ac -screen 0 1024x768x8 &
   - sleep 3

README.md

@@ -81,11 +81,11 @@ docker-compose rm -f
 docker volume rm osdata dbdata
 docker volume create --name=osdata
 docker volume create --name=dbdata
-docker-compose up
+OS_SERVER_NUMBER_OF_WORKERS=N docker-compose up
 docker-compose service scale worker=N
 
 # Or one line
-docker-compose rm -f && docker-compose build && docker volume rm osdata dbdata && docker volume create --name=osdata && docker volume create --name=dbdata && OS_SERVER_NUMBER_OF_WORKERS=5 docker-compose up && docker-compose service scale worker=N
+docker-compose rm -f && docker-compose build && docker volume rm osdata dbdata && docker volume create --name=osdata && docker volume create --name=dbdata && OS_SERVER_NUMBER_OF_WORKERS=N docker-compose up && docker-compose service scale worker=N
 ```
 
 Congratulations! Visit `http://localhost:8080` to see the OpenStudio Server Management Console.

docker/server/start-server.sh

@@ -13,7 +13,8 @@ cd /opt/openstudio/server && bundle exec rake db:mongoid:create_indexes
 # https://github.com/NREL/OpenStudio-server/issues/348
 ruby /usr/local/lib/memfix-controller.rb start
 
-# AP hack for now to ensure both resque and nginx/rails are running on web
+# AP hack for now to ensure both resque and nginx/rails are running on web.
+# Note that this will only run the analysis background queue as it is set in the docker-compose env file.
 bundle exec rake environment resque:work &
 
 /opt/nginx/sbin/nginx

docker/server/start-workers.sh

@@ -6,4 +6,5 @@ echo "Waiting for Mongo to start"
 echo "Waiting for Redis to start"
 /usr/local/bin/wait-for-it --strict -t 0 queue:6379
 
-cd /opt/openstudio/server && bundle exec rake environment resque:workers
+# Only start a single worker when calling this script (do not use resque:workers).
+cd /opt/openstudio/server && bundle exec rake environment resque:work

local_setup_scripts/docker-compose.yml

@@ -70,7 +70,7 @@ services:
     environment:
       - QUEUES=simulations
       - COUNT=1
-    command: bundle exec rake environment resque:workers
+    command: bundle exec rake environment resque:work
     volumes:
       - /mnt/openstudio
     depends_on:

server/README.md

@@ -43,6 +43,15 @@ COUNT=4 QUEUES=simulations bundle exec rake environment resque:workers
 QUEUES=analysis_wrappers bundle exec rake environment resque:work
 ```
 
+### Running Simulations for development in the foreground
+
+OpenStudio Server now runs the simulations through the OpenStudio CLI. In order for this to work on local development,
+the gems need to be installed in the OpenStudio installation directory. Run the following for OSX:
+
+```bash
+cd /Applications/OpenStudio-x.y.z/Ruby
+bundle install --path ./gems
+```
 
 ## Starting Rserve for development in the foreground
 
@@ -69,21 +78,9 @@ gem install nokogiri -- --use-system-libraries --with-xml2-include=/usr/include/
 gem install libxml-ruby -- --with-xml2-include=/usr/include/libxml2 --with-xml2-lib=/usr/lib/
 ```
 
-# Testing using Docker-compose
-
-```
-docker volume create --name=osdata
-docker-compose -f docker-compose.test.yml build
-docker-compose -f docker-compose.test.yml up
-
-# One line
-docker-compose rm -f && docker-compose -f docker-compose.test.yml build && docker-compose -f docker-compose.test.yml up
-```
-
 # Testing
 
-If running the tests on a local machine, then make sure to install
-geckodriver to run the webpage.
+If running the tests on a local machine, then make sure to install geckodriver to run the webpage.
 
 ```
 bundle install
@@ -108,31 +105,3 @@ publishing scripts are run on TravisCI. These are only run the develop and maste
 * Write tests for each analysis (expand existing SPEA test)
 * Add CLI path to config.yml
 * Add tests for embedded files on analysis model. Test result of R code that pushed to analysis model (i.e. best_point.json)
-
-# AWS Elastic Container Service
-
-It is possible to use Amazon's Elastic Container Service but it will
-be limited to only running one machine and it is not possible to add
-more worker nodes. The preferred approach is to use docker-machine and 
-docker-swarm or to custom deploy.
-
-```
-ecs-cli configure --cluster openstudio
-ecs-cli up --keypair <key-pair-name> --capability-iam --size 1 --instance-type t2.medium --port 8080
-ecs-cli compose -f docker-compose.deploy.yml up
-# Get the IP address from the console `ecs-cli ps`
-ecs-cli down --force
-```
-
-# Docker-Machine
-
-## AWS
-
-The easiest approach to using Docker-Machine is to export your keys as
-environment variables.
-
-```
-export $AWS_ACCESS_KEY_ID=<your-access-key>
-export $AWS_SECRET_ACCESS_KEY=<your-secret-access-key>
-```
-

server/config/environments/development.rb

@@ -76,4 +76,7 @@
 
   # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # TODO: Remove assumption that we are developing on a machine that has which installed! Make cross platform...
+  config.os_gemfile_path = File.expand_path(File.join(File.dirname(`which openstudio`), '../Ruby'))
 end

server/config/environments/docker-dev.rb

@@ -78,6 +78,5 @@
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # detect os version build path to gemfile.  this is passed to cli as --bundle
-  os_version = `openstudio openstudio_version`
   config.os_gemfile_path = "/var/oscli"
 end

server/config/environments/docker-test.rb

@@ -79,6 +79,5 @@
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # detect os version build path to gemfile.  this is passed to cli as --bundle
-  os_version = `openstudio openstudio_version`
   config.os_gemfile_path = "/var/oscli"
 end

server/config/environments/docker.rb

@@ -110,6 +110,5 @@
   config.active_support.deprecation = :notify
 
   # detect os version build path to gemfile.  this is passed to cli as --bundle
-  os_version = `openstudio openstudio_version`
   config.os_gemfile_path = "/var/oscli"
 end