Merged. Hard-coded server IP address.

andreyvit · Oct 28, 2007 · cacc127 · cacc127
2 parents 3d9d757 + 3d9d757
commit cacc127
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/config/database.yml b/config/database.yml
@@ -31,7 +31,7 @@ test:
 
 production:
   adapter: mysql
-  database: ujudge_production
+  database: ujudge_development
   username: root
   password: 
   host: localhost

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -20,5 +20,5 @@
 # Disable delivery errors if you bad email addresses should just be ignored
 #config.action_mailer.raise_delivery_errors = true
 
-BASE_URL="/ujudge"
+BASE_URL="/~jury/ujudge"
 config.action_mailer.perform_deliveries = false
diff --git a/lib/judge/server/server.rb b/lib/judge/server/server.rb
@@ -179,12 +179,12 @@ def get_file(rel_path, remote_mtime)
   end
 
   def calculate_rating_1(contest_id)
-    return if Time.now.to_i < @last_rating_calculation + 30
+    return if Time.now.to_i < @last_rating_calculation.to_i + 30
     do_calculate_rating(contest_id)
   end
 
   def calculate_rating_2(contest_id)
-    return unless Time.now.to_i > @last_rating_calculation + 120
+    return unless Time.now.to_i > @last_rating_calculation.to_i + 120
     do_calculate_rating(contest_id)
   end
 

diff --git a/lib/serverapi.rb b/lib/serverapi.rb
@@ -5,7 +5,7 @@ module Server
 
   def self.connect
     @@localserver = DRb.start_service('druby://localhost:0')
-    @@server = DRbObject.new(nil, 'druby://localhost:15837')
+    @@server = DRbObject.new(nil, 'druby://193.124.208.121:15837')
   end
 
   def self.instance

diff --git a/start-server.cmd b/start-server.cmd
@@ -1 +1 @@
-ruby script/drbserver
+ruby script/drbserver -h 193.124.208.121
diff --git a/start-web.cmd b/start-web.cmd
@@ -1 +1 @@
-ruby script/server
+ruby script/server -p 80 -e production