Skip to content
Browse files

FINALLY fixes errors

  • Loading branch information...
1 parent 3a23141 commit 6dc27058470fc3bbc3fdcbcd778dfe7a7f7c0bd4 @jschementi committed
Showing with 16 additions and 38 deletions.
  1. +1 −0 .gitignore
  2. +2 −13 app.rb
  3. +13 −24 config.ru
  4. +0 −1 frameworks/rubygems
  5. 0 public/favicon.gif
  6. 0 public/favicon.ico
  7. 0 public/robots.txt
View
1 .gitignore
@@ -1,3 +1,4 @@
data
log
pswd
+tmp
View
15 app.rb
@@ -1,16 +1,5 @@
-begin
- require 'rubygems'
-rescue LoadError
- require 'rubygems'
-end
-
-begin
- gem 'sinatra'
- require 'sinatra'
-rescue LoadError
- gem 'sinatra'
- require 'sinatra'
-end
+require 'rubygems'
+require 'sinatra'
require 'mymath'
require 'dbg'
View
37 config.ru
@@ -1,24 +1,13 @@
-begin
- require 'rubygems'
-rescue LoadError
- require 'rubygems'
-end
-
-begin
- gem 'sinatra'
- require 'sinatra'
-rescue LoadError
- gem 'sinatra'
- require 'sinatra'
-end
-
-set :env, :production
-disable :run
-
-log = File.new("log/sinatra.log", "a")
-STDOUT.reopen(log)
-STDERR.reopen(log)
-
-require 'app'
-
-run Sinatra.application
+require 'rubygems'
+require 'sinatra'
+require './app'
+
+set :environment, :production
+set :run, false
+
+log = File.new("/home/iruby/ironruby.info/log/sinatra.log", "a+")
+STDOUT.reopen(log)
+STDERR.reopen(log)
+
+run Sinatra::Application
+
1 frameworks/rubygems
@@ -1 +0,0 @@
-Subproject commit 842496e1dfcea57dfeab2c34e574a2c1abd8d7d0
View
0 public/favicon.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 public/favicon.ico
No changes.
View
0 public/robots.txt
No changes.

0 comments on commit 6dc2705

Please sign in to comment.
Something went wrong with that request. Please try again.