From 0564ea75ea4dd549386e1f49cf94cc85e2ce1e92 Mon Sep 17 00:00:00 2001
From: Tim Lossen <tim@lossen.de>
Date: Tue, 23 Feb 2010 23:05:30 +0100
Subject: [PATCH] added new instance type m2.xlarge

---
 .gitignore | 2 +-
 app/app.rb | 2 +-
 filter.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbe2a62..fc6eb0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@
 tmtags
 
 ## OTHER
-.twitter
 .amazon
 GeoIP.dat
 cron.log
+access.log
 app/public/data
diff --git a/app/app.rb b/app/app.rb
index 474607d..267b313 100644
--- a/app/app.rb
+++ b/app/app.rb
@@ -6,7 +6,7 @@
 
 REGIONS = ['us-west-1', 'us-east-1', 'eu-west-1']
 SYSTEMS = ['linux', 'windows']
-INSTANCES = ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.2xlarge', 'm2.4xlarge']
+INSTANCES = ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', 'm2.2xlarge', 'm2.4xlarge']
 
 get '/' do
   @which = 'eu-west-1.linux.m1.small'
diff --git a/filter.rb b/filter.rb
index c1e8496..96f74ea 100755
--- a/filter.rb
+++ b/filter.rb
@@ -23,7 +23,7 @@ def country(ip)
   GeoIP.new("#{ENV['HOME']}/GeoIP.dat").country(ip)[5]
 end
 
-#line = %q{85.179.21.217 - - [19/Dec/2009:22:37:02 +0100] "GET /charts/eu-west-1.windows.m1.small.html HTTP/1.1" 200 1826 "http://www.cloudexchange.org/charts/us-west-1.windows.m1.small.html" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5"}
+#line = %q{85.179.21.222 - - [19/Dec/2009:22:37:02 +0100] "GET /foo.html HTTP/1.1" 200 1826 "http://www.google.de/search?q=foo" "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5"}
 
 while line = $stdin.readline do
   parts = line.split(' ', 12)