diff --git a/app/assets/javascripts/v_libras/videos/index.js.erb b/app/assets/javascripts/v_libras/videos/index.js.erb index 74d9a8f..e0cc008 100644 --- a/app/assets/javascripts/v_libras/videos/index.js.erb +++ b/app/assets/javascripts/v_libras/videos/index.js.erb @@ -1,7 +1,7 @@ $(function() { $("a.badge").tooltip(); - var dispatcher = new WebSocketRails('150.165.204.80/websocket'); + var dispatcher = new WebSocketRails('150.165.204.80:110/websocket'); // subscribe to the channel var channel = dispatcher.subscribe('requests_update'); diff --git a/config/deploy.rb.1 b/config/deploy.rb.1 deleted file mode 100644 index cc0cb86..0000000 --- a/config/deploy.rb.1 +++ /dev/null @@ -1,106 +0,0 @@ -# -*- encoding : utf-8 -*- -# config valid only for Capistrano 3.1 -lock '3.2.1' - -server '150.165.204.80', port: 22, password: 'l1br4s-l1v3', roles: [:web, :app, :db], primary: true - -set :application, 'vlibras-web2' -set :repo_url, 'git@git.lavid.ufpb.br:vlibras-web2.git' -set :application, 'vlibras-web2' -set :user, 'deployer' - -# Default branch is :master -ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call - -set :puma_threads, [4, 16] -set :puma_workers, 0 - -# Default deploy_to directory is /var/www/my_app -set :deploy_to, "/home/#{fetch(:user)}/apps/#{fetch(:application)}" -set :deploy_via, :remote_cache -set :puma_bind, "unix://#{shared_path}/tmp/sockets/#{fetch(:application)}-puma.sock" -set :puma_state, "#{shared_path}/tmp/pids/puma.state" -set :puma_pid, "#{shared_path}/tmp/pids/puma.pid" -set :puma_access_log, "#{release_path}/log/puma.error.log" -set :puma_error_log, "#{release_path}/log/puma.access.log" -set :ssh_options, { forward_agent: true, user: fetch(:user), keys: %w(~/.ssh/id_rsa.pub) } -set :puma_preload_app, true -set :puma_worker_timeout, nil -set :puma_init_active_record, true # Change to false when not using ActiveRecord - -set :rails_env, 'production' - -set :use_sudo, false - -# Default value for :scm is :git -# set :scm, :git - -# Default value for :format is :pretty -# set :format, :pretty - -# Default value for :log_level is :debug -# set :log_level, :debug - -# Default value for :pty is false -set :pty, true - -# Default value for :linked_files is [] -set :linked_files, %w{config/database.yml .env} - -# Default value for linked_dirs is [] -set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} - -# Default value for default_env is {} -# set :default_env, { path: "/opt/ruby/bin:$PATH" } - -# Default value for keep_releases is 5 -set :keep_releases, 3 - -namespace :puma do - desc 'Create Directories for Puma Pids and Socket' - task :make_dirs do - on roles(:app) do - execute "mkdir #{shared_path}/tmp/sockets -p" - execute "mkdir #{shared_path}/tmp/pids -p" - end - end - - before :start, :make_dirs -end - -namespace :deploy do - desc "Make sure local git is in sync with remote." - task :check_revision do - on roles(:app) do - unless `git rev-parse HEAD` == `git rev-parse origin/master` - puts "WARNING: HEAD is not the same as origin/master" - puts "Run `git push` to sync changes." - exit - end - end - end - - desc 'Initial Deploy' - task :initial do - on roles(:app) do - before 'deploy:restart', 'puma:start' - invoke 'deploy' - end - end - - desc 'Restart application' - task :restart do - on roles(:app), in: :sequence, wait: 5 do - invoke 'puma:restart' - end - end - - before :starting, :check_revision - after :finishing, :compile_assets - after :finishing, :cleanup - after :finishing, :restart -end - -# ps aux | grep puma # Get puma pid -# kill -s SIGUSR2 pid # Restart puma -# kill -s SIGTERM pid # Stop puma diff --git a/config/deploy.rb.2 b/config/deploy.rb.2 deleted file mode 100644 index 4118eda..0000000 --- a/config/deploy.rb.2 +++ /dev/null @@ -1,84 +0,0 @@ -# Change these -server '150.165.204.80', port: 22, password: 'l1br4s-l1v3', roles: [:web, :app, :db], primary: true - -set :repo_url, 'git@git.lavid.ufpb.br:vlibras-web2.git' -set :application, 'vlibras-web2' -set :user, 'deployer' -set :puma_threads, [4, 16] -set :puma_workers, 0 - -# Don't change these unless you know what you're doing -set :pty, true -set :use_sudo, false -set :stage, :production -set :deploy_via, :remote_cache -set :deploy_to, "/home/#{fetch(:user)}/apps/#{fetch(:application)}" -set :puma_bind, "unix://#{shared_path}/tmp/sockets/#{fetch(:application)}-puma.sock" -set :puma_state, "#{shared_path}/tmp/pids/puma.state" -set :puma_pid, "#{shared_path}/tmp/pids/puma.pid" -set :puma_access_log, "#{release_path}/log/puma.error.log" -set :puma_error_log, "#{release_path}/log/puma.access.log" -set :ssh_options, { forward_agent: true, user: fetch(:user), keys: %w(~/.ssh/id_rsa.pub) } -set :puma_preload_app, true -set :puma_worker_timeout, nil -set :puma_init_active_record, true # Change to false when not using ActiveRecord - -## Defaults: -# set :scm, :git -# set :branch, :master -# set :format, :pretty -# set :log_level, :debug -# set :keep_releases, 5 - -## Linked Files & Directories (Default None): -# set :linked_files, %w{config/database.yml} -# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system} - -namespace :puma do - desc 'Create Directories for Puma Pids and Socket' - task :make_dirs do - on roles(:app) do - execute "mkdir #{shared_path}/tmp/sockets -p" - execute "mkdir #{shared_path}/tmp/pids -p" - end - end - - before :start, :make_dirs -end - -namespace :deploy do - desc "Make sure local git is in sync with remote." - task :check_revision do - on roles(:app) do - unless `git rev-parse HEAD` == `git rev-parse origin/master` - puts "WARNING: HEAD is not the same as origin/master" - puts "Run `git push` to sync changes." - exit - end - end - end - - desc 'Initial Deploy' - task :initial do - on roles(:app) do - before 'deploy:restart', 'puma:start' - invoke 'deploy' - end - end - - desc 'Restart application' - task :restart do - on roles(:app), in: :sequence, wait: 5 do - invoke 'puma:restart' - end - end - - before :starting, :check_revision - after :finishing, :compile_assets - after :finishing, :cleanup - after :finishing, :restart -end - -# ps aux | grep puma # Get puma pid -# kill -s SIGUSR2 pid # Restart puma -# kill -s SIGTERM pid # Stop puma diff --git a/config/initializers/websocket_rails.rb b/config/initializers/websocket_rails.rb index eac9102..2253ff9 100644 --- a/config/initializers/websocket_rails.rb +++ b/config/initializers/websocket_rails.rb @@ -16,7 +16,8 @@ WebsocketRails.setup do |config| # Change to true to enable standalone server mode # Start the standalone server with rake websocket_rails:start_server # * Requires Redis - config.standalone = false + config.standalone = true + config.standalone_port = 110 # Change to true to enable channel synchronization between # multiple server instances. -- libgit2 0.21.2