Revision 64d7e30f

b/lib/server/masterd.py
279 279
      logging.info("Received invalid arguments of type '%s'", type(args))
280 280
      raise ValueError("Invalid arguments type '%s'" % type(args))
281 281

  
282
    if method not in luxi.REQ_ALL:
283
      logging.info("Received invalid request '%s'", method)
284
      raise ValueError("Invalid operation '%s'" % method)
285

  
282 286
    # TODO: Rewrite to not exit in each 'if/elif' branch
283 287

  
284 288
    if method == luxi.REQ_SUBMIT_JOB:
......
446 450
      return _SetWatcherPause(context, until)
447 451

  
448 452
    else:
449
      logging.info("Received invalid request '%s'", method)
450
      raise ValueError("Invalid operation '%s'" % method)
453
      logging.critical("Request '%s' in luxi.REQ_ALL, but not known", method)
454
      raise errors.ProgrammerError("Operation '%s' in luxi.REQ_ALL,"
455
                                   " but not implemented" % method)
451 456

  
452 457
  def _Query(self, op):
453 458
    """Runs the specified opcode and returns the result.

Also available in: Unified diff