diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss index 0c637b16f..eac86bc3e 100644 --- a/web/app/assets/stylesheets/client/jamkazam.css.scss +++ b/web/app/assets/stylesheets/client/jamkazam.css.scss @@ -436,7 +436,6 @@ input[type="text"], input[type="password"]{ /* Following is a style adjustment for the sign-in table spacing */ #sign-in td { padding: 4px; } - .spinner-large { background-image: url('/assets/shared/spinner.gif'); background-repeat:no-repeat; diff --git a/web/app/controllers/api_music_sessions_controller.rb b/web/app/controllers/api_music_sessions_controller.rb index 49d8e5e98..3838f04f2 100644 --- a/web/app/controllers/api_music_sessions_controller.rb +++ b/web/app/controllers/api_music_sessions_controller.rb @@ -180,7 +180,7 @@ class ApiMusicSessionsController < ApiController end if SampleApp::Application.config.storage_type == :fog - uri = @perf_data.uri + uri = @perfdata.uri s3 = AWS::S3.new(:access_key_id => SampleApp::Application.config.aws_access_key_id, :secret_access_key => SampleApp::Application.config.aws_secret_access_key) bucket = s3.buckets[SampleApp::Application.config.aws_bucket] @@ -193,7 +193,7 @@ class ApiMusicSessionsController < ApiController write_url = bucket.objects[uri].url_for(:write, :expires => SampleApp::Application.config.perf_data_signed_url_timeout, :'response_content_type' => 'text/csv').to_s - logger.debug("*** server can upload to url #{write_url}") + logger.debug("*** client can upload to url #{write_url}") redirect_to write_url else diff --git a/web/config/application.rb b/web/config/application.rb index 28c019531..aa736e3d3 100644 --- a/web/config/application.rb +++ b/web/config/application.rb @@ -138,7 +138,6 @@ if defined?(Bundler) end # perf_data configs - #config.perf_data_bucket_key = "perf_data" config.perf_data_signed_url_timeout = 3600 * 24 # 1 day # crash_dump configs