Merge pull request #1517 from chrismeyersfsu/fix-scan_job_time

fix scan job timestamp

awx/main/management/commands/run_fact_cache_receiver.py

@@ -9,7 +9,7 @@ from datetime import datetime
 # Django
 from django.core.management.base import NoArgsCommand
 from django.conf import settings
-#from django.core.exceptions import Does
+from django.utils import timezone
 
 # AWX
 from awx.main.models.fact import Fact
@@ -64,7 +64,7 @@ class FactCacheReceiver(object):
             return None
 
         (module_name, facts) = self.process_facts(facts_data)
-        self.timestamp = datetime.fromtimestamp(date_key, None)
+        self.timestamp = datetime.fromtimestamp(date_key, timezone.utc)
 
         # Update existing Fact entry
         try:

awx/main/tests/functional/commands/test_run_fact_cache_receiver.py

@@ -7,6 +7,7 @@ from datetime import datetime
 import json
 
 # Django
+from django.utils import timezone
 
 # AWX
 from awx.main.management.commands.run_fact_cache_receiver import FactCacheReceiver
@@ -18,7 +19,7 @@ def check_process_fact_message_module(fact_returned, data, module_name):
     date_key = data['date_key']
 
     # Ensure 1, and only 1, fact created
-    timestamp = datetime.fromtimestamp(date_key, None)
+    timestamp = datetime.fromtimestamp(date_key, timezone.utc)
     assert 1 == Fact.objects.all().count()
 
     host_obj = Host.objects.get(name=data['host'], inventory__id=data['inventory_id'])

awx/plugins/fact_caching/tower.py

@@ -32,7 +32,6 @@
 import sys
 import os
 import time
-import datetime
 from copy import deepcopy
 from ansible import constants as C
 try:
@@ -55,7 +54,7 @@ class CacheModule(BaseCacheModule):
 
         # This is the local tower zmq connection
         self._tower_connection = C.CACHE_PLUGIN_CONNECTION
-        self.date_key = time.mktime(datetime.datetime.utcnow().timetuple())
+        self.date_key = time.time()
         try:
             self.context = zmq.Context()
             self.socket = self.context.socket(zmq.REQ)