summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/orm/models.py22
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py4
2 files changed, 17 insertions, 9 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 26abf370d9..c3fb766cf4 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -29,6 +29,11 @@ from django.core import validators
29from django.conf import settings 29from django.conf import settings
30import django.db.models.signals 30import django.db.models.signals
31 31
32
33import logging
34logger = logging.getLogger("toaster")
35
36
32class GitURLValidator(validators.URLValidator): 37class GitURLValidator(validators.URLValidator):
33 import re 38 import re
34 regex = re.compile( 39 regex = re.compile(
@@ -855,8 +860,8 @@ class LayerIndexLayerSource(LayerSource):
855 except Exception as e: 860 except Exception as e:
856 import traceback 861 import traceback
857 if proxy_settings is not None: 862 if proxy_settings is not None:
858 print "EE: Using proxy ", proxy_settings 863 logger.info("EE: Using proxy %s" % proxy_settings)
859 print "EE: could not connect to %s, skipping update: %s\n%s" % (self.apiurl, e, traceback.format_exc(e)) 864 logger.warning("EE: could not connect to %s, skipping update: %s\n%s" % (self.apiurl, e, traceback.format_exc(e)))
860 return 865 return
861 866
862 # update branches; only those that we already have names listed in the 867 # update branches; only those that we already have names listed in the
@@ -865,7 +870,7 @@ class LayerIndexLayerSource(LayerSource):
865 if len(whitelist_branch_names) == 0: 870 if len(whitelist_branch_names) == 0:
866 raise Exception("Failed to make list of branches to fetch") 871 raise Exception("Failed to make list of branches to fetch")
867 872
868 print "Fetching branches" 873 logger.debug("Fetching branches")
869 branches_info = _get_json_response(apilinks['branches'] 874 branches_info = _get_json_response(apilinks['branches']
870 + "?filter=name:%s" % "OR".join(whitelist_branch_names)) 875 + "?filter=name:%s" % "OR".join(whitelist_branch_names))
871 for bi in branches_info: 876 for bi in branches_info:
@@ -895,7 +900,7 @@ class LayerIndexLayerSource(LayerSource):
895 transaction.set_autocommit(True) 900 transaction.set_autocommit(True)
896 901
897 # update layerbranches/layer_versions 902 # update layerbranches/layer_versions
898 print "Fetching layer information" 903 logger.debug("Fetching layer information")
899 layerbranches_info = _get_json_response(apilinks['layerBranches'] 904 layerbranches_info = _get_json_response(apilinks['layerBranches']
900 + "?filter=branch:%s" % "OR".join(map(lambda x: str(x.up_id), [i for i in Branch.objects.filter(layer_source = self) if i.up_id is not None] )) 905 + "?filter=branch:%s" % "OR".join(map(lambda x: str(x.up_id), [i for i in Branch.objects.filter(layer_source = self) if i.up_id is not None] ))
901 ) 906 )
@@ -933,7 +938,7 @@ class LayerIndexLayerSource(LayerSource):
933 try: 938 try:
934 dependlist[lv].append(Layer_Version.objects.get(layer_source = self, layer__up_id = ldi['dependency'], up_branch = lv.up_branch)) 939 dependlist[lv].append(Layer_Version.objects.get(layer_source = self, layer__up_id = ldi['dependency'], up_branch = lv.up_branch))
935 except Layer_Version.DoesNotExist: 940 except Layer_Version.DoesNotExist:
936 print "Cannot find layer version ", self, ldi['dependency'], lv.up_branch 941 logger.warning("Cannot find layer version %s dep:%s up_brach:%s" % (self, ldi['dependency'], lv.up_branch))
937 942
938 for lv in dependlist: 943 for lv in dependlist:
939 LayerVersionDependency.objects.filter(layer_version = lv).delete() 944 LayerVersionDependency.objects.filter(layer_version = lv).delete()
@@ -944,7 +949,7 @@ class LayerIndexLayerSource(LayerSource):
944 949
945 950
946 # update machines 951 # update machines
947 print "Fetching machine information" 952 logger.debug("Fetching machine information")
948 machines_info = _get_json_response(apilinks['machines'] 953 machines_info = _get_json_response(apilinks['machines']
949 + "?filter=layerbranch:%s" % "OR".join(map(lambda x: str(x.up_id), Layer_Version.objects.filter(layer_source = self))) 954 + "?filter=layerbranch:%s" % "OR".join(map(lambda x: str(x.up_id), Layer_Version.objects.filter(layer_source = self)))
950 ) 955 )
@@ -962,7 +967,7 @@ class LayerIndexLayerSource(LayerSource):
962 transaction.set_autocommit(True) 967 transaction.set_autocommit(True)
963 968
964 # update recipes; paginate by layer version / layer branch 969 # update recipes; paginate by layer version / layer branch
965 print "Fetching target information" 970 logger.debug("Fetching target information")
966 recipes_info = _get_json_response(apilinks['recipes'] 971 recipes_info = _get_json_response(apilinks['recipes']
967 + "?filter=layerbranch:%s" % "OR".join(map(lambda x: str(x.up_id), Layer_Version.objects.filter(layer_source = self))) 972 + "?filter=layerbranch:%s" % "OR".join(map(lambda x: str(x.up_id), Layer_Version.objects.filter(layer_source = self)))
968 ) 973 )
@@ -1236,8 +1241,7 @@ def invalidate_cache(**kwargs):
1236 try: 1241 try:
1237 cache.clear() 1242 cache.clear()
1238 except Exception as e: 1243 except Exception as e:
1239 print "Problem with cache backend: Failed to clear cache" 1244 logger.warning("Problem with cache backend: Failed to clear cache: %s" % e)
1240 pass
1241 1245
1242django.db.models.signals.post_save.connect(invalidate_cache) 1246django.db.models.signals.post_save.connect(invalidate_cache)
1243django.db.models.signals.post_delete.connect(invalidate_cache) 1247django.db.models.signals.post_delete.connect(invalidate_cache)
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index d6bd7c94ba..0f05955af4 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -42,6 +42,10 @@ import json
42from os.path import dirname 42from os.path import dirname
43import itertools 43import itertools
44 44
45import logging
46
47logger = logging.getLogger("toaster")
48
45# all new sessions should come through the landing page; 49# all new sessions should come through the landing page;
46# determine in which mode we are running in, and redirect appropriately 50# determine in which mode we are running in, and redirect appropriately
47def landing(request): 51def landing(request):