Browse Source

Merge pull request #14093 from leela/rename-rq-utils

fix: rq utiliy module conflicts with redis queue's rq package
version-14
Leela vadlamudi 3 years ago
committed by GitHub
parent
commit
5378fe37f4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 4 deletions
  1. +1
    -1
      frappe/commands/__init__.py
  2. +1
    -1
      frappe/commands/redis_utils.py
  3. +1
    -1
      frappe/tests/test_redis.py
  4. +1
    -1
      frappe/utils/background_jobs.py
  5. +0
    -0
      frappe/utils/redis_queue.py

+ 1
- 1
frappe/commands/__init__.py View File

@@ -102,7 +102,7 @@ def get_commands():
from .site import commands as site_commands
from .translate import commands as translate_commands
from .utils import commands as utils_commands
from .redis import commands as redis_commands
from .redis_utils import commands as redis_commands

clickable_link = (
"\x1b]8;;https://frappeframework.com/docs\afrappeframework.com\x1b]8;;\a"


frappe/commands/redis.py → frappe/commands/redis_utils.py View File

@@ -3,7 +3,7 @@ import os
import click

import frappe
from frappe.utils.rq import RedisQueue
from frappe.utils.redis_queue import RedisQueue
from frappe.installer import update_site_config

@click.command('create-rq-users')

+ 1
- 1
frappe/tests/test_redis.py View File

@@ -5,7 +5,7 @@ import redis

import frappe
from frappe.utils import get_bench_id
from frappe.utils.rq import RedisQueue
from frappe.utils.redis_queue import RedisQueue
from frappe.utils.background_jobs import get_redis_conn

def version_tuple(version):


+ 1
- 1
frappe/utils/background_jobs.py View File

@@ -16,7 +16,7 @@ import frappe
from frappe import _
import frappe.monitor
from frappe.utils import cstr, get_bench_id
from frappe.utils.rq import RedisQueue
from frappe.utils.redis_queue import RedisQueue
from frappe.utils.commands import log




frappe/utils/rq.py → frappe/utils/redis_queue.py View File


Loading…
Cancel
Save