diff --git a/lib/travis/api/v3/queries/log.rb b/lib/travis/api/v3/queries/log.rb
index f93ff92d..2bc3147b 100644
--- a/lib/travis/api/v3/queries/log.rb
+++ b/lib/travis/api/v3/queries/log.rb
@@ -1,9 +1,18 @@
 module Travis::API::V3
   class Queries::Log < Query
     def find(job)
-      #TODO check for the log in the DB, and then fetch it from S3 if not.
-      
-      job.log
+      #TODO check for the log in the DB, if it's not there then fetch it from S3.
+      log = Models::Log.find_by_job_id
+      #if the log exists and has not bee archived yet, then collect the log_parts and return the contents
+      unless log.nil? || !log.archived_at.nil?
+        log_parts = Models::Log::Part.where(log_id: log.id)
+        contents = log_parts.each do |log_part|
+          log_part.content
+        end
+        contents
+      else
+        #go look in S3
+      end
     end
   end
 end