@@ -23,12 +23,10 @@ import com.metamx.common.scala.Logging
2323import com .metamx .common .scala .lifecycle ._
2424import com .metamx .common .scala .untyped .Dict
2525import com .twitter .app .Flags
26- import io .imply .hostbook .GeoLookup
2726import java .io .File
2827
2928object ConsoleTicker extends Logging
3029{
31- private val geoDb = GeoLookup .fromFreeDownloadableCityDatabase(new File (Files .createTempDir(), " geodb" ))
3230 private val ipPattern = " (\\ d+.\\ d+.\\ d+.\\ d+)" .r
3331
3432 private var messageCounter = 0
@@ -51,8 +49,7 @@ object ConsoleTicker extends Logging
5149
5250 val listener = new MessageListener {
5351 override def process (message : Message ) = {
54- writer.write(Jackson .generate(withGeo(message.toMap)))
55-
52+ writer.write(Jackson .generate(message.toMap))
5653 messageCounter += 1
5754 if (messageCounter % 100 == 0 ) {
5855 log.info(s " Processed [ ${messageCounter}] messages " )
@@ -143,21 +140,4 @@ object ConsoleTicker extends Logging
143140 }
144141 }
145142
146- def withGeo (map : Dict ): Dict = {
147- map ++ (map(" user" ).asInstanceOf [String ] match {
148- case ipPattern(ip) => {
149- val result = geoDb.lookup(ip)
150- Dict (
151- " isAnonymous" -> true ,
152- " cityName" -> result.cityName.orNull,
153- " countryIsoCode" -> result.countryIsoCode.orNull,
154- " countryName" -> result.countryName.orNull,
155- " metroCode" -> result.metroCode.orNull,
156- " regionIsoCode" -> result.regionIsoCode.orNull,
157- " regionName" -> result.regionName.orNull
158- )
159- }
160- case _ => Dict (" isAnonymous" -> false )
161- })
162- }
163143}
0 commit comments