Merge branch 'hashbucket'

ee/cli/plugins/site.py

@@ -9,6 +9,7 @@ from ee.core.services import EEService
 from ee.cli.plugins.sitedb import *
 from ee.core.git import EEGit
 from subprocess import Popen
+from ee.core.nginxhashbucket import hashbucket
 import sys
 import os
 import glob
@@ -482,6 +483,9 @@ class EESiteCreateController(CementBaseController):
             try:
                 # setup NGINX configuration, and webroot
                 setupdomain(self, data)
+
+                # Fix Nginx Hashbucket size error
+                hashbucket(self)
             except SiteError as e:
                 # call cleanup actions on failure
                 Log.info(self, Log.FAIL + "Oops Something went wrong !!")

ee/core/nginxhashbucket.py

@@ -0,0 +1,59 @@
+"""EasyEngine Hash bucket calculate function for Nginx"""
+from ee.core.fileutils import EEFileUtils
+import math
+import os
+import fileinput
+import re
+import subprocess
+
+
+def hashbucket(self):
+    # Check Nginx Hashbucket error
+    sub = subprocess.Popen('nginx -t', stdout=subprocess.PIPE,
+                           stderr=subprocess.PIPE, shell=True)
+    output, error_output = sub.communicate()
+    if 'server_names_hash_bucket_size' not in str(error_output):
+        return True
+
+    count = 0
+    # Get the list of sites-availble
+    sites_list = os.listdir("/etc/nginx/sites-enabled/")
+
+    # Count the number of characters in site names
+    for site in sites_list:
+        count = sum([count, len(site)])
+
+    # Calculate Nginx hash bucket size
+    ngx_calc = math.trunc(sum([math.log(count, 2), 2]))
+    ngx_hash = math.trunc(math.pow(2, ngx_calc))
+
+    # Replace hashbucket in Nginx.conf file
+    if EEFileUtils.grep(self, "/etc/nginx/nginx.conf",
+                        "server_names_hash_bucket_size"):
+        for line in fileinput.FileInput("/etc/nginx/nginx.conf", inplace=1):
+            if "server_names_hash_bucket_size" in line:
+                print("\tserver_names_hash_bucket_size {0};".format(ngx_hash))
+            else:
+                print(line, end='')
+
+    elif os.path.isfile('/etc/nginx/conf.d/ee-nginx.conf'):
+        if EEFileUtils.grep(self, "/etc/nginx/conf.d/ee-nginx.conf",
+                            "server_names_hash_bucket_size"):
+            for line in fileinput.FileInput("/etc/nginx/conf.d/ee-nginx.conf",
+                                            inplace=1):
+                if "server_names_hash_bucket_size" in line:
+                    print("server_names_hash_bucket_size {0};"
+                          .format(ngx_hash))
+                else:
+                    print(line, end='')
+
+        else:
+            with open('/etc/nginx/conf.d/ee-nginx.conf', 'a') as conf:
+                conf.write("server_names_hash_bucket_size {0};\n"
+                           .format(ngx_hash))
+    else:
+        EEFileUtils.searchreplace(self, '/etc/nginx/nginx.conf',
+                                  "gzip_disable \"msie6\";",
+                                  "gzip_disable \"msie6\";\n"
+                                  "\tserver_names_hash_bucket_size {0};\n"
+                                  .format(ngx_hash))